diff --git a/src/utils/resolveJoins.js b/src/utils/resolveJoins.js
index 1a57483b8..8b81b39f1 100644
--- a/src/utils/resolveJoins.js
+++ b/src/utils/resolveJoins.js
@@ -1,5 +1,9 @@
 // Used to resolve Fn::Join in environment variables
 export default function resolveJoins(environment) {
+  if (!environment) {
+    return undefined
+  }
+
   const newEnv = {}
 
   Object.keys(environment).forEach((key) => {