diff --git a/code/modules/lootpanel/_lootpanel.dm b/code/modules/lootpanel/_lootpanel.dm
index c4215b60f95..f7cfab8d8cd 100644
--- a/code/modules/lootpanel/_lootpanel.dm
+++ b/code/modules/lootpanel/_lootpanel.dm
@@ -45,7 +45,7 @@
 /datum/lootpanel/ui_close(mob/user)
 	. = ..()
 
-	UnregisterSignal(source_turf, COMSIG_ATOM_ENTERED)
+	UnregisterSignal(source_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON))
 	source_turf = null
 	reset_contents()
 
diff --git a/code/modules/lootpanel/misc.dm b/code/modules/lootpanel/misc.dm
index 2a5123752a2..8f510cd4331 100644
--- a/code/modules/lootpanel/misc.dm
+++ b/code/modules/lootpanel/misc.dm
@@ -2,8 +2,8 @@
 /datum/lootpanel/proc/open(turf/tile)
 	if (tile != source_turf)
 		if (source_turf)
-			UnregisterSignal(source_turf, COMSIG_ATOM_ENTERED)
-		RegisterSignal(tile, COMSIG_ATOM_ENTERED, PROC_REF(on_source_turf_entered))
+			UnregisterSignal(source_turf, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON))
+		RegisterSignals(tile, list(COMSIG_ATOM_ENTERED, COMSIG_ATOM_AFTER_SUCCESSFUL_INITIALIZED_ON), PROC_REF(on_source_turf_entered))
 
 	source_turf = tile