diff --git a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
index 276aa620324e27..90ca1f552e8560 100644
--- a/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
+++ b/Content.Shared/Movement/Systems/SharedJetpackSystem.cs
@@ -125,8 +125,15 @@ private void OnJetpackToggle(EntityUid uid, JetpackComponent component, ToggleJe
 
     private bool CanEnableOnGrid(EntityUid? gridUid)
     {
-        return gridUid == null ||
-               (!HasComp<GravityComponent>(gridUid));
+        //return gridUid == null ||
+        //       (!HasComp<GravityComponent>(gridUid));  //SS220 Convert to comment
+
+        //SS220 Fix jet in zero gravity begin
+        if (gridUid == null || !TryComp<GravityComponent>(gridUid, out var comp))
+            return true;
+
+        return !comp.Enabled;
+        //SS220 Fix jet in zero gravity end
     }
 
     private void OnJetpackGetAction(EntityUid uid, JetpackComponent component, GetItemActionsEvent args)