diff --git a/lib/questionlib.php b/lib/questionlib.php
index f153365d1df..00b1c7eb946 100644
--- a/lib/questionlib.php
+++ b/lib/questionlib.php
@@ -416,7 +416,9 @@ function delete_question($questionid) {
     // Now recursively delete all child questions
     if ($children = get_records('question', 'parent', $questionid)) {
         foreach ($children as $child) {
-            delete_question($child->id);
+            if ($child->id != $questionid) {
+                delete_question($child->id);
+            }
         }
     }