diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml
index c5a703377b9..4d263100711 100644
--- a/Resources/Maps/asterisk.yml
+++ b/Resources/Maps/asterisk.yml
@@ -244,8 +244,8 @@ entities:
       type: MapGrid
     - type: Broadphase
     - bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
+      angularDamping: 10000
+      linearDamping: 10000
       fixedRotation: False
       bodyType: Dynamic
       type: Physics
@@ -254,6 +254,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      angularDamping: 10000
+      linearDamping: 10000
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
diff --git a/Resources/Maps/edge.yml b/Resources/Maps/edge.yml
index 6b18f5132c8..64149b39651 100644
--- a/Resources/Maps/edge.yml
+++ b/Resources/Maps/edge.yml
@@ -346,8 +346,8 @@ entities:
       type: MapGrid
     - type: Broadphase
     - bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
+      angularDamping: 10000
+      linearDamping: 10000
       fixedRotation: False
       bodyType: Dynamic
       type: Physics
@@ -356,6 +356,8 @@ entities:
     - type: OccluderTree
     - type: SpreaderGrid
     - type: Shuttle
+      angularDamping: 10000
+      linearDamping: 10000
     - type: GridPathfinding
     - gravityShakeSound: !type:SoundPathSpecifier
         path: /Audio/Effects/alert.ogg
diff --git a/Resources/Maps/pebble.yml b/Resources/Maps/pebble.yml
index cc128495b51..ad8243a1b8b 100644
--- a/Resources/Maps/pebble.yml
+++ b/Resources/Maps/pebble.yml
@@ -278,8 +278,8 @@ entities:
       type: MapGrid
     - type: Broadphase
     - bodyStatus: InAir
-      angularDamping: 0.05
-      linearDamping: 0.05
+      angularDamping: 10000
+      linearDamping: 10000
       fixedRotation: False
       bodyType: Dynamic
       type: Physics
@@ -4747,6 +4747,8 @@ entities:
       type: BecomesStation
     - type: OccluderTree
     - type: Shuttle
+      angularDamping: 10000
+      linearDamping: 10000
     - type: GridPathfinding
     - type: RadiationGridResistance
     - type: GasTileOverlay