diff --git a/source/blender/depsgraph/intern/depsgraph_query_filter.cc b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
index d6965206844..9bfe8815703 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_filter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_filter.cc
@@ -104,11 +104,16 @@ void deg_unlink_opnode(OperationDepsNode *op_node)
 		all_links.push_back(rel);
 	}
 	
-	/* Delete all collected entries */
+	/* Delete all collected relations */
 	foreach (DepsRelation *rel, all_links) {
 		rel->unlink();
 		OBJECT_GUARDED_DELETE(rel, DepsRelation);
 	}
+	
+	/* Remove from entry tags */
+	if (BLI_gset_haskey(graph->entry_tags, op_node)) {
+		BLI_gset_remove(graph->entry_tags, op_node, NULL);
+	}
 }
 
 /* Remove and free given ID Node */