diff --git a/packages/entities/entities-certificates/src/components/CACertificateList.vue b/packages/entities/entities-certificates/src/components/CACertificateList.vue
index 6da199f05c..5db0b279a1 100644
--- a/packages/entities/entities-certificates/src/components/CACertificateList.vue
+++ b/packages/entities/entities-certificates/src/components/CACertificateList.vue
@@ -32,7 +32,7 @@
         >
           <div class="button-row">
             <KButton
-              v-if="!showEmptyState && config.app === 'konnect'"
+              v-if="enableV2EmptyStates && !showEmptyState && config.app === 'konnect'"
               appearance="secondary"
               class="open-learning-hub"
               data-testid="ca-certificates-learn-more-button"
diff --git a/packages/entities/entities-certificates/src/components/CertificateList.vue b/packages/entities/entities-certificates/src/components/CertificateList.vue
index 66bb463da0..23bb1dfa4b 100644
--- a/packages/entities/entities-certificates/src/components/CertificateList.vue
+++ b/packages/entities/entities-certificates/src/components/CertificateList.vue
@@ -32,7 +32,7 @@
         >
           <div class="button-row">
             <KButton
-              v-if="!showEmptyState && config.app === 'konnect'"
+              v-if="enableV2EmptyStates && !showEmptyState && config.app === 'konnect'"
               appearance="secondary"
               class="open-learning-hub"
               data-testid="certificates-learn-more-button"
diff --git a/packages/entities/entities-consumers/src/components/ConsumerList.vue b/packages/entities/entities-consumers/src/components/ConsumerList.vue
index d6928cbed9..858f3b6903 100644
--- a/packages/entities/entities-consumers/src/components/ConsumerList.vue
+++ b/packages/entities/entities-consumers/src/components/ConsumerList.vue
@@ -36,7 +36,7 @@
         >
           <div class="button-row">
             <KButton
-              v-if="!showEmptyState && config.app === 'konnect'"
+              v-if="enableV2EmptyStates && !showEmptyState && config.app === 'konnect'"
               appearance="secondary"
               class="open-learning-hub"
               data-testid="consumers-learn-more-button"
diff --git a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
index 1c60bf2d12..259a99b2f5 100644
--- a/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
+++ b/packages/entities/entities-gateway-services/src/components/GatewayServiceList.vue
@@ -33,7 +33,7 @@
         >
           <div class="button-row">
             <KButton
-              v-if="!showEmptyState && config.app === 'konnect'"
+              v-if="enableV2EmptyStates && !showEmptyState && config.app === 'konnect'"
               appearance="secondary"
               class="open-learning-hub"
               data-testid="gateway-services-learn-more-button"
diff --git a/packages/entities/entities-plugins/src/components/PluginList.vue b/packages/entities/entities-plugins/src/components/PluginList.vue
index 897be8f9ec..d57fe45c3a 100644
--- a/packages/entities/entities-plugins/src/components/PluginList.vue
+++ b/packages/entities/entities-plugins/src/components/PluginList.vue
@@ -34,7 +34,7 @@
         >
           <div class="button-row">
             <KButton
-              v-if="!showEmptyState && config.app === 'konnect'"
+              v-if="enableV2EmptyStates && !showEmptyState && config.app === 'konnect'"
               appearance="secondary"
               class="open-learning-hub"
               data-testid="plugins-learn-more-button"