diff --git a/apps/web/cypress/tests/integrations-list-modal.spec.ts b/apps/web/cypress/tests/integrations-list-modal.spec.ts
index 80c9955f1b7..4727b969aa8 100644
--- a/apps/web/cypress/tests/integrations-list-modal.spec.ts
+++ b/apps/web/cypress/tests/integrations-list-modal.spec.ts
@@ -127,13 +127,11 @@ describe('Integrations List Modal', function () {
     cy.getByTestId('select-provider-sidebar').should('be.visible');
     cy.getByTestId('sidebar-close').should('be.visible').click();
 
-    cy.getByTestId('add-provider').should('be.disabled').contains('Add a provider');
-    checkTableLoading();
-
     cy.wait('@getIntegrations');
     cy.wait('@getEnvironments');
 
-    cy.getByTestId('add-provider').should('be.enabled');
+    checkTableLoading();
+
     cy.getByTestId('no-integrations-placeholder').should('be.visible');
     cy.contains('Choose a channel you want to start sending notifications');
 
@@ -153,10 +151,10 @@ describe('Integrations List Modal', function () {
     cy.getByTestId('select-provider-sidebar').should('be.visible');
     cy.getByTestId('sidebar-close').should('be.visible').click();
 
-    cy.getByTestId('add-provider').should('be.disabled').contains('Add a provider');
     checkTableLoading();
 
     cy.wait('@getIntegrations');
+    cy.getByTestId('add-provider').should('be.enabled').contains('Add a provider');
 
     checkTableRow(
       {
diff --git a/apps/web/cypress/tests/integrations-list-page.spec.ts b/apps/web/cypress/tests/integrations-list-page.spec.ts
index 2ba68ffcdcc..e3684f0bc12 100644
--- a/apps/web/cypress/tests/integrations-list-page.spec.ts
+++ b/apps/web/cypress/tests/integrations-list-page.spec.ts
@@ -126,13 +126,11 @@ describe('Integrations List Page', function () {
     cy.visit('/integrations');
     cy.location('pathname').should('equal', '/integrations');
 
-    cy.getByTestId('add-provider').should('be.disabled').contains('Add a provider');
-    checkTableLoading();
-
     cy.wait('@getIntegrations');
     cy.wait('@getEnvironments');
 
-    cy.getByTestId('add-provider').should('be.enabled');
+    checkTableLoading();
+
     cy.getByTestId('no-integrations-placeholder').should('be.visible');
     cy.contains('Choose a channel you want to start sending notifications');
 
@@ -151,10 +149,10 @@ describe('Integrations List Page', function () {
     cy.visit('/integrations');
     cy.location('pathname').should('equal', '/integrations');
 
-    cy.getByTestId('add-provider').should('be.disabled').contains('Add a provider');
     checkTableLoading();
 
     cy.wait('@getIntegrations');
+    cy.getByTestId('add-provider').should('be.enabled').contains('Add a provider');
 
     checkTableRow(
       {
@@ -315,12 +313,10 @@ describe('Integrations List Page', function () {
       cy.visit('/integrations');
       cy.location('pathname').should('equal', '/integrations');
 
-      cy.getByTestId('add-provider').should('be.disabled').contains('Add a provider');
-
       cy.wait('@getIntegrations');
       cy.wait('@getEnvironments');
 
-      cy.getByTestId('add-provider').should('be.enabled').click();
+      cy.getByTestId('add-provider').should('be.enabled').contains('Add a provider').click();
 
       cy.location('pathname').should('equal', '/integrations/create');
       cy.getByTestId('select-provider-sidebar').should('be.visible').as('selectProviderSidebar');
diff --git a/apps/web/src/pages/integrations/IntegrationsList.tsx b/apps/web/src/pages/integrations/IntegrationsList.tsx
index afe0ed6a964..721ce176bd1 100644
--- a/apps/web/src/pages/integrations/IntegrationsList.tsx
+++ b/apps/web/src/pages/integrations/IntegrationsList.tsx
@@ -81,9 +81,11 @@ export const IntegrationsList = ({
   return (
     <PageContainer title="Integrations">
       <PageHeader title="Integrations Store" />
-      <Container fluid sx={{ padding: '0 30px 8px 30px' }}>
-        <IntegrationsListToolbar onAddProviderClick={onAddProviderClick} areIntegrationsLoading={isLoading} />
-      </Container>
+      <When truthy={hasIntegrations}>
+        <Container fluid sx={{ padding: '0 30px 8px 30px' }}>
+          <IntegrationsListToolbar onAddProviderClick={onAddProviderClick} areIntegrationsLoading={isLoading} />
+        </Container>
+      </When>
       <When truthy={hasIntegrations || isLoading}>
         <Table
           onRowClick={onRowClickCallback}