diff --git a/.env.production b/.env.production
index 8d892e935..32a19fe57 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 REACT_APP_ENV=production
 REACT_APP_UI_VERSION=${UI_VERSION}
 
-REACT_APP_UI_DISABLED_TOOLBAR=false
+REACT_APP_UI_DISABLED_TABLE_HOSTS=true
diff --git a/src/components/productView/productView.js b/src/components/productView/productView.js
index 8972556b7..8cc321759 100644
--- a/src/components/productView/productView.js
+++ b/src/components/productView/productView.js
@@ -121,7 +121,7 @@ const ProductView = ({ t, toolbarGraph, toolbarGraphDescription, useRouteDetail:
               (!initialInventoryFilters && !initialSubscriptionsInventoryFilters) || helpers.UI_DISABLED_TABLE
             }
           >
-            {initialInventoryFilters && (
+            {!helpers.UI_DISABLED_TABLE_HOSTS && initialInventoryFilters && (
               <InventoryTab
                 key={`inventory_hosts_${productId}`}
                 title={t('curiosity-inventory.tabHosts', { context: ['noInstances', productId] })}
@@ -137,7 +137,7 @@ const ProductView = ({ t, toolbarGraph, toolbarGraphDescription, useRouteDetail:
                 />
               </InventoryTab>
             )}
-            {initialSubscriptionsInventoryFilters && (
+            {!helpers.UI_DISABLED_TABLE_SUBSCRIPTIONS && initialSubscriptionsInventoryFilters && (
               <InventoryTab
                 key={`inventory_subs_${productId}`}
                 title={t('curiosity-inventory.tabSubscriptions', { context: productId })}
diff --git a/src/components/productView/productViewOpenShiftContainer.js b/src/components/productView/productViewOpenShiftContainer.js
index db331e02a..51ede14a9 100644
--- a/src/components/productView/productViewOpenShiftContainer.js
+++ b/src/components/productView/productViewOpenShiftContainer.js
@@ -135,7 +135,7 @@ const ProductViewOpenShiftContainer = ({ t, useRouteDetail: useAliasRouteDetail
                 viewId={viewId}
               />
             </InventoryTab>
-            {initialSubscriptionsInventoryFilters && (
+            {!helpers.UI_DISABLED_TABLE_SUBSCRIPTIONS && initialSubscriptionsInventoryFilters && (
               <InventoryTab
                 key={`inventory_subs_${productId}`}
                 title={t('curiosity-inventory.tabSubscriptions', { context: productId })}