diff --git a/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs b/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs
index 91cfc04cc..48ea30861 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Map/MapEntity.cs
@@ -652,28 +652,34 @@ namespace Barotrauma
             bool shouldUpdatePower = mapEntityUpdateTick % PoweredUpdateInterval == 0;
 
             // Buffer lists to avoid repeated allocations
-            List<Hull> hullList = new List<Hull>(Hull.HullList);
-            List<Structure> structureList = new List<Structure>(Structure.WallList);
-            List<Gap> gapList = new List<Gap>(Gap.GapList);
-            List<Item> itemList = new List<Item>(Item.ItemList);
+            var hullList = shouldUpdateMapEntities ? Hull.HullList.ToList() : null;
+            var structureList = shouldUpdateMapEntities ? Structure.WallList.ToList() : null;
+            var gapList = Gap.GapList.ToList();
+            var itemList = shouldUpdateMapEntities ? Item.ItemList.ToList() : null;
 
             // First phase: parallel updates that have no order dependencies
             Parallel.Invoke(parallelOptions,
                 // Hull parallel update
                 () =>
                 {
-                    Parallel.ForEach(hullList, parallelOptions, hull =>
+                    if (shouldUpdateMapEntities && hullList != null)
                     {
-                        hull.Update(deltaTime, cam);
-                    });
+                        Parallel.ForEach(hullList, parallelOptions, hull =>
+                        {
+                            hull.Update(deltaTime * MapEntityUpdateInterval, cam);
+                        });
+                    }
                 },
                 // Structure parallel update
                 () =>
                 {
-                    Parallel.ForEach(structureList, parallelOptions, structure =>
+                    if (shouldUpdateMapEntities && structureList != null)
                     {
-                        structure.Update(deltaTime, cam);
-                    });
+                        Parallel.ForEach(structureList, parallelOptions, structure =>
+                        {
+                            structure.Update(deltaTime * MapEntityUpdateInterval, cam);
+                        });
+                    }
                 },
                 // Gap reset (must be done before update)
                 () =>
@@ -688,7 +694,7 @@ namespace Barotrauma
                 {
                     if (shouldUpdatePower)
                     {
-                        Powered.UpdatePower(deltaTime);
+                        Powered.UpdatePower(deltaTime * PoweredUpdateInterval);
                     }
                 }
             );
@@ -715,30 +721,33 @@ namespace Barotrauma
 #endif
 
             // Item update (Item.Update() is not thread-safe and must be executed on the main thread)
-            Item.UpdatePendingConditionUpdates(deltaTime);
-
-            float scaledDeltaTime = deltaTime;
-            Item lastUpdatedItem = null;
-
-            try
+            if (shouldUpdateMapEntities && itemList != null)
             {
-                foreach (Item item in itemList)
+                Item.UpdatePendingConditionUpdates(deltaTime);
+
+                float scaledDeltaTime = deltaTime * MapEntityUpdateInterval;
+                Item lastUpdatedItem = null;
+                
+                try
                 {
-                    lastUpdatedItem = item;
-                    item.Update(scaledDeltaTime, cam);
+                    foreach (Item item in itemList)
+                    {
+                        lastUpdatedItem = item;
+                        item.Update(scaledDeltaTime, cam);
+                    }
+                }
+                catch (InvalidOperationException e)
+                {
+                    GameAnalyticsManager.AddErrorEventOnce(
+                        "MapEntity.UpdateAll:ItemUpdateInvalidOperation",
+                        GameAnalyticsManager.ErrorSeverity.Critical,
+                        $"Error while updating item {lastUpdatedItem?.Name ?? "null"}: {e.Message}");
+                    throw new InvalidOperationException($"Error while updating item {lastUpdatedItem?.Name ?? "null"}", innerException: e);
                 }
-            }
-            catch (InvalidOperationException e)
-            {
-                GameAnalyticsManager.AddErrorEventOnce(
-                    "MapEntity.UpdateAll:ItemUpdateInvalidOperation",
-                    GameAnalyticsManager.ErrorSeverity.Critical,
-                    $"Error while updating item {lastUpdatedItem?.Name ?? "null"}: {e.Message}");
-                throw new InvalidOperationException($"Error while updating item {lastUpdatedItem?.Name ?? "null"}", innerException: e);
-            }
 
-            UpdateAllProjSpecific(scaledDeltaTime);
-            Spawner?.Update();
+                UpdateAllProjSpecific(scaledDeltaTime);
+                Spawner?.Update();
+            }
 
 #if CLIENT
             sw.Stop();
diff --git a/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs b/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
index 4d4634e31..e29da7114 100644
--- a/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
+++ b/Barotrauma/BarotraumaShared/SharedSource/Screens/GameScreen.cs
@@ -151,16 +151,23 @@ namespace Barotrauma
 
             var physicsBodies = PhysicsBody.List.ToList();
 
-            Parallel.ForEach(physicsBodies, parallelOptions, body =>
+            Parallel.Invoke(parallelOptions,
+                () =>
                 {
-                    if ((body.Enabled || body.UserData is Character) && 
-                        body.BodyType != BodyType.Static) 
-                    { 
-                        body.Update(); 
-                    }
-                });
-
-            GameMain.GameSession?.Update((float)deltaTime);
+                    Parallel.ForEach(physicsBodies, parallelOptions, body =>
+                    {
+                        if ((body.Enabled || body.UserData is Character) && 
+                            body.BodyType != BodyType.Static) 
+                        { 
+                            body.Update(); 
+                        }
+                    });
+                },
+                () =>
+                {
+                    GameMain.GameSession?.Update((float)deltaTime);
+                }
+            );
 
             foreach (PhysicsBody body in physicsBodies)
             {
@@ -176,8 +183,10 @@ namespace Barotrauma
             var sw = new System.Diagnostics.Stopwatch();
             sw.Start();
 
-            GameMain.ParticleManager.Update((float)deltaTime);
-            if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, cam);
+            Parallel.Invoke(parallelOptions,
+                () => GameMain.ParticleManager.Update((float)deltaTime),
+                () => { if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, cam); }
+            );
             
             sw.Stop();
             GameMain.PerformanceCounter.AddElapsedTicks("Update:Particles+Level", sw.ElapsedTicks);
@@ -243,25 +252,25 @@ namespace Barotrauma
             Character.Controlled?.UpdateLocalCursor(cam);
 
 #elif SERVER
-            if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, Camera.Instance);
-
-            Character.UpdateAll((float)deltaTime, Camera.Instance);
+            Parallel.Invoke(parallelOptions,
+                () => { if (Level.Loaded != null) Level.Loaded.Update((float)deltaTime, Camera.Instance); },
+                () => Character.UpdateAll((float)deltaTime, Camera.Instance)
+            );
 #endif
 
             var submarines = Submarine.Loaded.ToList();
-            foreach(Submarine sub in submarines)
+            Parallel.ForEach(submarines, parallelOptions, sub =>
             {
                 sub.SetPrevTransform(sub.Position);
-            }
+            });
 
-            // 
-            foreach (PhysicsBody body in physicsBodies)
+            Parallel.ForEach(physicsBodies, parallelOptions, body =>
             {
                 if (body.Enabled && body.BodyType != FarseerPhysics.BodyType.Static) 
-            { 
-                body.SetPrevTransform(body.SimPosition, body.Rotation); 
+                { 
+                    body.SetPrevTransform(body.SimPosition, body.Rotation); 
                 }
-            }
+            });
 
 #if CLIENT
             MapEntity.UpdateAll((float)deltaTime, cam, parallelOptions);
@@ -293,10 +302,11 @@ namespace Barotrauma
             GameMain.PerformanceCounter.AddElapsedTicks("Update:Ragdolls", sw.ElapsedTicks);
             sw.Restart(); 
 #endif
-            foreach (var sub in submarines) 
+
+            Parallel.ForEach(submarines, parallelOptions, sub =>
             {
                 sub.Update((float)deltaTime);
-            }
+            });
 
 #if CLIENT
             sw.Stop();