diff --git a/Resources/Changelog/Parts/smoke.yml b/Resources/Changelog/Parts/smoke.yml
new file mode 100644
index 0000000000..26d3d26706
--- /dev/null
+++ b/Resources/Changelog/Parts/smoke.yml
@@ -0,0 +1,4 @@
+author: mirrorcult
+changes:
+- type: Fix # One of the following: Add, Remove, Tweak, Fix
+  message: Smoke spam no longer crashes the server.
diff --git a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
index 30eb9fd068..570bc1ed48 100644
--- a/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
+++ b/Resources/Prototypes/Entities/Effects/chemistry_effects.yml
@@ -18,6 +18,7 @@
     solutions:
       solutionArea:
         maxVol: 600
+        canReact: false
 
 - type: entity
   id: Foam
@@ -54,6 +55,7 @@
     solutions:
       solutionArea:
         maxVol: 600
+        canReact: false
   - type: Slippery
 
 - type: entity
diff --git a/Resources/Prototypes/Recipes/Reactions/chemicals.yml b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
index e6ded1e74c..06a1a73429 100644
--- a/Resources/Prototypes/Recipes/Reactions/chemicals.yml
+++ b/Resources/Prototypes/Recipes/Reactions/chemicals.yml
@@ -114,7 +114,7 @@
       duration: 10
       spreadDelay: 0.5
       removeDelay: 0.5
-      diluteReagents: false
+      diluteReagents: true
       prototypeId: Smoke
       sound:
         path: /Audio/Effects/smoke.ogg