diff --git a/Content.Shared/Gravity/SharedGravitySystem.Shake.cs b/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
index 84be4ebdba..f264698cd9 100644
--- a/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
+++ b/Content.Shared/Gravity/SharedGravitySystem.Shake.cs
@@ -45,6 +45,9 @@ public abstract partial class SharedGravitySystem
 
     public void StartGridShake(EntityUid uid, GravityComponent? gravity = null)
     {
+        if (Terminating(uid))
+            return;
+
         if (!Resolve(uid, ref gravity, false))
             return;