diff --git a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
index e957fbd6c7..8e2f0c2422 100644
--- a/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/BuckleSystem.cs
@@ -17,14 +17,14 @@ namespace Content.Server.GameObjects.EntitySystems
 
             UpdatesAfter.Add(typeof(InteractionSystem));
             UpdatesAfter.Add(typeof(InputSystem));
-            EntityManager.EventBus.SubscribeEvent<MoveEvent>(EventSource.Local, this, MoveEvent);
+            SubscribeLocalEvent<MoveEvent>(MoveEvent);
         }
 
         public override void Shutdown()
         {
             base.Shutdown();
-            
-            EntityManager.EventBus.UnsubscribeEvent<MoveEvent>(EventSource.Local, this);
+
+            UnsubscribeLocalEvent<MoveEvent>();
         }
 
         private void MoveEvent(MoveEvent ev)