diff --git a/lua/SS13_base.lua b/lua/SS13_base.lua
index f49908f0942..ea04c8c6503 100644
--- a/lua/SS13_base.lua
+++ b/lua/SS13_base.lua
@@ -100,7 +100,8 @@ function SS13.register_signal(datum, signal, func)
 	callback:call_proc("RegisterSignal", datum, signal, "Invoke")
 	local path = { "__SS13_signal_handlers", datumWeakRef, signal, callbackWeakRef, "func" }
 	callback.vars.arguments = { path }
-	if not __SS13_signal_handlers[datumWeakRef]._cleanup then
+	-- Turfs don't remove their signals on deletion.
+	if not __SS13_signal_handlers[datumWeakRef]._cleanup and not SS13.istype(datum, "/turf") then
 		local cleanupCallback = SS13.new("/datum/callback", SS13.state, "call_function_return_first")
 		local cleanupPath = { "__SS13_signal_handlers", datumWeakRef, "_cleanup"}
 		cleanupCallback.vars.arguments = { cleanupPath }
@@ -134,6 +135,11 @@ function SS13.unregister_signal(datum, signal, callback)
 		local callbackWeakRef = dm.global_proc("WEAKREF", handler_callback)
 		if not SS13.istype(datum, "/datum/weakref") then
 			handler_callback:call_proc("UnregisterSignal", datum, signal)
+		else
+			local actualDatum = datum:call_proc("hard_resolve")
+			if SS13.is_valid(actualDatum) then
+				handler_callback:call_proc("UnregisterSignal", actualDatum, signal)
+			end
 		end
 		SS13.stop_tracking(handler_callback)
 	end
diff --git a/lua/handler_group.lua b/lua/handler_group.lua
index fff63ad18e4..0246d33c744 100644
--- a/lua/handler_group.lua
+++ b/lua/handler_group.lua
@@ -14,7 +14,7 @@ function HandlerGroup:register_signal(datum, signal, func)
 	if not callback then
 		return
 	end
-	table.insert(self.registered, { datum = datum, signal = signal, callback = callback  })
+	table.insert(self.registered, { datum = dm.global_proc("WEAKREF", datum), signal = signal, callback = callback  })
 end
 
 -- Clears all the signals that have been registered on this HandlerGroup