diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm
index 91e8a0cc349..c2e5a24fcab 100644
--- a/code/datums/components/_component.dm
+++ b/code/datums/components/_component.dm
@@ -235,6 +235,8 @@
 						target.comp_lookup = null
 						break
 			if(0)
+				if(lookup[sig] != src)
+					continue
 				lookup -= sig
 				if(!length(lookup))
 					target.comp_lookup = null