diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
index 3bee8a6569..7d6f133e93 100644
--- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
+++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs
@@ -99,8 +99,6 @@ public sealed class GatewayGeneratorSystem : EntitySystem
         {
             GenerateDestination(uid, generator);
         }
-
-        Dirty(uid, generator);
     }
 
     private void GenerateDestination(EntityUid uid, GatewayGeneratorComponent? generator = null)
diff --git a/Content.Server/Gateway/Systems/GatewaySystem.cs b/Content.Server/Gateway/Systems/GatewaySystem.cs
index d05cca3af6..14be113248 100644
--- a/Content.Server/Gateway/Systems/GatewaySystem.cs
+++ b/Content.Server/Gateway/Systems/GatewaySystem.cs
@@ -291,7 +291,6 @@ public sealed class GatewaySystem : EntitySystem
             return;
 
         gatewayComp.Name = gatewayName;
-        Dirty(gatewayUid, gatewayComp);
     }
 }
 
diff --git a/RobustToolbox b/RobustToolbox
index eb092e90ef..ca64aae7f0 160000
--- a/RobustToolbox
+++ b/RobustToolbox
@@ -1 +1 @@
-Subproject commit eb092e90efc7ac4ae562bc46f9b760745a29e289
+Subproject commit ca64aae7f096b2dca707121e70256eaa173a86d5