diff --git a/Resources/Changelog/Parts/spray.yml b/Resources/Changelog/Parts/spray.yml
new file mode 100644
index 0000000000..444be3dd4b
--- /dev/null
+++ b/Resources/Changelog/Parts/spray.yml
@@ -0,0 +1,4 @@
+author: Zumorica
+changes:
+  - type: Fix # One of the following: Add, Remove, Tweak, Fix
+    message: Fixes spray puff and fire extinguisher cloud not moving.
diff --git a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
index dcbe3d4fde..a024fba25d 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/fire_extinguisher.yml
@@ -53,7 +53,7 @@
         - state: extinguish
           map: [ "enum.VaporVisualLayers.Base" ]
     - type: Physics
-      bodyType: KinematicController
+      bodyType: Dynamic
       fixtures:
       - shape:
           !type:PhysShapeAabb
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
index 2226d60bbd..0bae25cef0 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -57,7 +57,6 @@
   name: "vapor"
   abstract: true
   components:
-  - type: SnapGrid
   - type: SolutionContainer
     maxVol: 50
   - type: Vapor
@@ -69,7 +68,7 @@
       - state: chempuff
         map: [ "enum.VaporVisualLayers.Base" ]
   - type: Physics
-    bodyType: KinematicController
+    bodyType: Dynamic
     fixtures:
     - shape:
         !type:PhysShapeAabb