diff --git a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs b/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs
index 4e27a40d3d..b43a1c763a 100644
--- a/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs
+++ b/Content.Client/GameObjects/Components/Arcade/BlockGameBoundUserInterface.cs
@@ -21,7 +21,6 @@ namespace Content.Client.GameObjects.Components.Arcade
             base.Open();
 
             _menu = new BlockGameMenu(this);
-            _menu.OnClose += () => SendMessage(new BlockGameMessages.BlockGameUserUnregisterMessage());
             _menu.OnClose += Close;
             _menu.OpenCentered();
         }
diff --git a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs b/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
index 363fcd1faf..db6db84d8b 100644
--- a/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
+++ b/Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
@@ -119,6 +119,7 @@ namespace Content.Server.GameObjects.Components.Arcade
             if (UserInterface != null)
             {
                 UserInterface.OnReceiveMessage += UserInterfaceOnOnReceiveMessage;
+                UserInterface.OnClosed += UnRegisterPlayerSession;
             }
             _game = new BlockGame(this);
         }
@@ -136,9 +137,6 @@ namespace Content.Server.GameObjects.Components.Arcade
         {
             switch (obj.Message)
             {
-                case BlockGameMessages.BlockGameUserUnregisterMessage unregisterMessage:
-                    UnRegisterPlayerSession(obj.Session);
-                    break;
                 case BlockGameMessages.BlockGamePlayerActionMessage playerActionMessage:
                     if (obj.Session != _player) break;
 
diff --git a/Content.Shared/Arcade/BlockGameMessages.cs b/Content.Shared/Arcade/BlockGameMessages.cs
index 8b98933db1..3110edd8dc 100644
--- a/Content.Shared/Arcade/BlockGameMessages.cs
+++ b/Content.Shared/Arcade/BlockGameMessages.cs
@@ -58,9 +58,6 @@ namespace Content.Shared.Arcade
             }
         }
 
-        [Serializable, NetSerializable]
-        public class BlockGameUserUnregisterMessage : BoundUserInterfaceMessage{}
-
         [Serializable, NetSerializable]
         public class BlockGameSetScreenMessage : BoundUserInterfaceMessage
         {