diff --git a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
index a0feab7052c..813a18f974c 100644
--- a/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
+++ b/Content.Shared/Movement/Components/MovementSpeedModifierComponent.cs
@@ -14,7 +14,7 @@ public sealed partial class MovementSpeedModifierComponent : Component
         // Weightless
         public const float DefaultMinimumFrictionSpeed = 0.005f;
         public const float DefaultWeightlessFriction = 1f;
-        public const float DefaultWeightlessFrictionNoInput = 0.2f;
+        public const float DefaultWeightlessFrictionNoInput = 0f;
         public const float DefaultWeightlessModifier = 0.7f;
         public const float DefaultWeightlessAcceleration = 1f;
 
diff --git a/Content.Shared/Physics/FrictionRemoverSystem.cs b/Content.Shared/Physics/FrictionRemoverSystem.cs
new file mode 100644
index 00000000000..65bbe9e4d23
--- /dev/null
+++ b/Content.Shared/Physics/FrictionRemoverSystem.cs
@@ -0,0 +1,25 @@
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Systems;
+
+namespace Content.Shared.Physics;
+
+public sealed class FrictionRemoverSystem : EntitySystem
+{
+    [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<PhysicsComponent, PhysicsSleepEvent>(RemoveDampening);
+    }
+
+
+    private void RemoveDampening(EntityUid uid, PhysicsComponent component, PhysicsSleepEvent args)
+    {
+        _physics.SetAngularDamping(uid, component, 0f, false);
+        _physics.SetLinearDamping(uid, component, 0f);
+    }
+}
diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
index 1680dd6cda6..df7fad06dd2 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/moth.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -44,9 +44,7 @@
       Female: UnisexMoth
       Unsexed: UnisexMoth
   - type: MovementSpeedModifier
-    weightlessAcceleration: 1.5 # Move around more easily in space.
-    weightlessFriction: 1
-    weightlessModifier: 1
+    weightlessAcceleration: 2.5 # Move around more easily in space.
   - type: Flammable
     damage:
       types: