diff --git a/NewHorizons/Builder/Atmosphere/AirBuilder.cs b/NewHorizons/Builder/Atmosphere/AirBuilder.cs
index 7b5ab84d..7b961d14 100644
--- a/NewHorizons/Builder/Atmosphere/AirBuilder.cs
+++ b/NewHorizons/Builder/Atmosphere/AirBuilder.cs
@@ -23,15 +23,18 @@ namespace NewHorizons.Builder.Atmosphere
             sfv._allowShipAutoroll = true;
             sfv._disableOnStart = false;
 
-            // Try to parent it to the same as other rulesets to match vanilla but if its null put it on the root object
-            var ruleSetGO = planetGO.GetComponentInChildren<PlanetoidRuleset>()?.gameObject;
-            if (ruleSetGO == null) ruleSetGO = planetGO;
+            if (config.Atmosphere.hasShockLayer)
+            {
+                // Try to parent it to the same as other rulesets to match vanilla but if its null put it on the root object
+                var ruleSetGO = planetGO.GetComponentInChildren<PlanetoidRuleset>()?.gameObject;
+                if (ruleSetGO == null) ruleSetGO = planetGO;
 
-            var shockLayerRuleset = ruleSetGO.AddComponent<ShockLayerRuleset>();
-            shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric;
-            shockLayerRuleset._radialCenter = airGO.transform;
-            shockLayerRuleset._minShockSpeed = config.Atmosphere.minShockSpeed;
-            shockLayerRuleset._maxShockSpeed = config.Atmosphere.maxShockSpeed;
+                var shockLayerRuleset = ruleSetGO.AddComponent<ShockLayerRuleset>();
+                shockLayerRuleset._type = ShockLayerRuleset.ShockType.Atmospheric;
+                shockLayerRuleset._radialCenter = airGO.transform;
+                shockLayerRuleset._minShockSpeed = config.Atmosphere.minShockSpeed;
+                shockLayerRuleset._maxShockSpeed = config.Atmosphere.maxShockSpeed;
+            }
 
             if (config.Atmosphere.clouds != null)
             {
diff --git a/NewHorizons/External/Modules/AtmosphereModule.cs b/NewHorizons/External/Modules/AtmosphereModule.cs
index f03f3ceb..d2b835ee 100644
--- a/NewHorizons/External/Modules/AtmosphereModule.cs
+++ b/NewHorizons/External/Modules/AtmosphereModule.cs
@@ -100,6 +100,11 @@ namespace NewHorizons.External.Modules
         /// </summary>
         public bool useAtmosphereShader;
 
+        /// <summary>
+        /// Whether this atmosphere will have flames appear when your ship goes a certain speed.
+        /// </summary>
+        [DefaultValue(true)] public bool hasShockLayer = true;
+
         /// <summary>
         /// Minimum speed that your ship can go in the atmosphere where flames will appear.
         /// </summary>