diff --git a/code/datums/components/storage/ui.dm b/code/datums/components/storage/ui.dm
index 89084f70e8..68bb12b303 100644
--- a/code/datums/components/storage/ui.dm
+++ b/code/datums/components/storage/ui.dm
@@ -220,6 +220,7 @@
 	M.client.screen -= list(ui_boxes, ui_close, ui_left, ui_right, ui_continuous, get_ui_item_objects_hide())
 	if(M.active_storage == src)
 		M.active_storage = null
+	UnregisterSignal(M, COMSIG_MOB_CLIENT_LOGOUT)
 	LAZYREMOVE(is_using, M)
 	return TRUE