diff --git a/src/utils/resolveJoins.js b/src/utils/resolveJoins.js
index 8b81b39f1..88312df4f 100644
--- a/src/utils/resolveJoins.js
+++ b/src/utils/resolveJoins.js
@@ -8,6 +8,9 @@ export default function resolveJoins(environment) {
 
   Object.keys(environment).forEach((key) => {
     const value = environment[key]
+    if (!value) {
+      return
+    }
     const joinArray = value['Fn::Join']
     const isJoin = Boolean(joinArray)