2 files changed, 6 insertions, 0 deletions
diff --git a/makima/src/server/handlers/contracts.rs b/makima/src/server/handlers/contracts.rs
index 462b385..f16f33d 100644
--- a/makima/src/server/handlers/contracts.rs
+++ b/makima/src/server/handlers/contracts.rs
@@ -612,6 +612,9 @@ pub async fn delete_contract(
         }
     }
 
+    // Clean up any pending supervisor questions for this contract
+    state.remove_pending_questions_for_contract(id);
+
     // Clean up all task worktrees BEFORE deleting the contract
     // (because CASCADE delete will remove tasks from DB)
     cleanup_contract_worktrees(pool, &state, id).await;
diff --git a/makima/src/server/handlers/mesh.rs b/makima/src/server/handlers/mesh.rs
index 3d05f35..3d64eb4 100644
--- a/makima/src/server/handlers/mesh.rs
+++ b/makima/src/server/handlers/mesh.rs
@@ -482,6 +482,9 @@ pub async fn delete_task(
         }
     }
 
+    // Clean up any pending supervisor questions for this task
+    state.remove_pending_questions_for_task(id);
+
     match repository::delete_task_for_owner(pool, id, auth.owner_id).await {
         Ok(true) => StatusCode::NO_CONTENT.into_response(),
         Ok(false) => (