diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index daa57afe14e..8ac067c0316 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -693,6 +693,14 @@ void BKE_object_unlink(Object *ob)
 						sbuts->pinid = NULL;
 					}
 				}
+				else if (sl->spacetype == SPACE_NODE) {
+					SpaceNode *snode = (SpaceNode *)sl;
+
+					if (snode->from == (ID *)ob) {
+						snode->flag &= ~SNODE_PIN;
+						snode->from = NULL;
+					}
+				}
 			}
 
 			sa = sa->next;