diff --git a/packages/server/src/environment.js b/packages/server/src/environment.js
index e7bc35b04b..4044bb3787 100644
--- a/packages/server/src/environment.js
+++ b/packages/server/src/environment.js
@@ -74,9 +74,10 @@ module.exports = {
   },
 }
 
-// convert any strings to numbers if required, like "0" would be true otherwise
+// clean up any environment variable edge cases
 for (let [key, value] of Object.entries(module.exports)) {
-  if (typeof value === "string" && !isNaN(parseInt(value))) {
-    module.exports[key] = parseInt(value)
+  // handle the edge case of "0" to disable an environment variable
+  if (value === "0") {
+    module.exports[key] = 0
   }
 }
diff --git a/packages/worker/src/environment.js b/packages/worker/src/environment.js
index 74bd40314c..a1fab84112 100644
--- a/packages/worker/src/environment.js
+++ b/packages/worker/src/environment.js
@@ -52,3 +52,11 @@ module.exports = {
     return !isDev()
   },
 }
+
+// clean up any environment variable edge cases
+for (let [key, value] of Object.entries(module.exports)) {
+  // handle the edge case of "0" to disable an environment variable
+  if (value === "0") {
+    module.exports[key] = 0
+  }
+}