diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 1f2f4e2a4..0c3cad40f 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -2157,7 +2157,16 @@ sub clearConfiguration {
 	}
 
 	# Todo - check return code
-	# TODO: should we disable all target drivers as well?
+
+	my $drivers = $SCST->drivers();
+
+	foreach my $driver (@{$drivers}) {
+		my $targets = $SCST->targets($driver);
+
+		foreach my $target (@{$targets}) {
+			disableTarget($driver, $target);
+		}
+	}
 
 	print "\t-> Configuration cleared.\n";
 }