diff --git a/admin/clientquestionnaire.php b/admin/clientquestionnaire.php
index ddd183c5..c5c50c2f 100644
--- a/admin/clientquestionnaire.php
+++ b/admin/clientquestionnaire.php
@@ -114,7 +114,10 @@ if (isset($_POST['submit']))
 
 	$sql = "DELETE 
 		FROM client_questionnaire
-		WHERE 1";
+		WHERE questionnaire_id IN (
+			SELECT questionnaire_id
+			FROM questionnaire	
+			WHERE enabled = 1)";
 
 	$db->Execute($sql);
 
diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php
index ecf25b8b..60762700 100644
--- a/admin/operatorquestionnaire.php
+++ b/admin/operatorquestionnaire.php
@@ -114,7 +114,10 @@ if (isset($_POST['submit']))
 
 	$sql = "DELETE 
 		FROM operator_questionnaire
-		WHERE 1";
+		WHERE questionnaire_id IN (
+			SELECT questionnaire_id
+			FROM questionnaire
+			WHERE enabled = 1)";
 
 	$db->Execute($sql);