diff --git a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
index 39e63e4e25..6e9461e66e 100644
--- a/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
+++ b/Content.Server/Atmos/EntitySystems/GasAnalyzerSystem.cs
@@ -81,7 +81,10 @@ namespace Content.Server.Atmos.EntitySystems
         {
             component.Target = target;
             component.User = user;
-            component.LastPosition = Transform(target ?? user).Coordinates;
+            if (target != null)
+                component.LastPosition = Transform(target.Value).Coordinates;
+            else
+                component.LastPosition = null;
             component.Enabled = true;
             Dirty(component);
             UpdateAppearance(component);