diff --git a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
index ff7c2f0fe..ba5dd6de9 100644
--- a/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
+++ b/src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/variables-tab/variables-tab.component.ts
@@ -74,7 +74,7 @@ export class VariablesTabComponent implements OnInit {
       if (envVarType === 'cfGuid' || envVarType === stratosEndpointGuidKey) {
         return;
       }
-      const envVars = allEnvVars[0].entity[envVarType];
+      const envVars = (allEnvVars[0].entity[envVarType]) ? allEnvVars[0].entity[envVarType] : {};
       result.push({
         section: true,
         name: envVarType.replace('_json', ''),
diff --git a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
index c16c3fc0b..29f181430 100644
--- a/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
+++ b/src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app-variables/cf-app-variables-data-source.ts
@@ -44,7 +44,7 @@ export class CfAppVariablesDataSource extends ListDataSource<ListAppEnvVar, APIR
         if (!variables || variables.length === 0) {
           return [];
         }
-        const env = variables[0].entity.environment_json;
+        const env = (variables[0].entity.environment_json) ? variables[0].entity.environment_json : {};
         const rows = Object.keys(env).map(name => ({ name, value: env[name] }));
         return rows;
       }),