diff --git a/src/layout/dwindle.h b/src/layout/dwindle.h
index bf56d4dc..e3b9f281 100644
--- a/src/layout/dwindle.h
+++ b/src/layout/dwindle.h
@@ -151,6 +151,12 @@ static void dwindle_remove(DwindleNode **root, Client *c) {
 		return;
 
 	DwindleNode *parent = leaf->parent;
+
+	if (dwindle_locked_h_node == leaf || dwindle_locked_h_node == parent)
+		dwindle_locked_h_node = NULL;
+	if (dwindle_locked_v_node == leaf || dwindle_locked_v_node == parent)
+		dwindle_locked_v_node = NULL;
+
 	if (!parent) {
 		free(leaf);
 		*root = NULL;