diff --git a/src/pages/configuration/containers/SystemInfo/index.jsx b/src/pages/configuration/containers/SystemInfo/index.jsx
index 8c2fd793..7b996679 100644
--- a/src/pages/configuration/containers/SystemInfo/index.jsx
+++ b/src/pages/configuration/containers/SystemInfo/index.jsx
@@ -25,6 +25,10 @@ export class Service extends Base {
     return this.props.rootStore.checkEndpoint('cinder');
   }
 
+  get enableHeat() {
+    return this.props.rootStore.checkEndpoint('heat');
+  }
+
   get tabs() {
     const tabs = [
       {
@@ -42,19 +46,21 @@ export class Service extends Base {
         key: 'neutronAgent',
         component: NeutronAgent,
       },
-      {
-        title: t('Orchestration Services'),
-        key: 'heatService',
-        component: HeatService,
-      },
     ];
     if (this.enableCinder) {
-      tabs.splice(3, 0, {
+      tabs.push({
         title: t('Block Storage Services'),
         key: 'cinderService',
         component: CinderService,
       });
     }
+    if (this.enableHeat) {
+      tabs.push({
+        title: t('Orchestration Services'),
+        key: 'heatService',
+        component: HeatService,
+      });
+    }
     return tabs;
   }
 }