diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index e3615782a8..a36eb76350 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -746,7 +746,8 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                             class="euiFlexItem euiFlexItem--flexGrowZero"
                           >
                             <button
-                              class="euiButton euiButton--primary euiButton--fill"
+                              class="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                              disabled=""
                               type="button"
                             >
                               <span
@@ -885,6 +886,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               className="euiFlexItem euiFlexItem--flexGrowZero"
                             >
                               <EuiButton
+                                disabled={true}
                                 fill={true}
                                 iconSide="right"
                                 iconType="arrowRight"
@@ -893,19 +895,19 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                               >
                                 <EuiButtonDisplay
                                   baseClassName="euiButton"
-                                  disabled={false}
+                                  disabled={true}
                                   element="button"
                                   fill={true}
                                   iconSide="right"
                                   iconType="arrowRight"
-                                  isDisabled={false}
+                                  isDisabled={true}
                                   isLoading={false}
                                   onClick={[Function]}
                                   type="button"
                                 >
                                   <button
-                                    className="euiButton euiButton--primary euiButton--fill"
-                                    disabled={false}
+                                    className="euiButton euiButton--primary euiButton--fill euiButton-isDisabled"
+                                    disabled={true}
                                     onClick={[Function]}
                                     style={
                                       Object {
diff --git a/public/components/integrations/components/setup_integration.tsx b/public/components/integrations/components/setup_integration.tsx
index bb2956db7e..37884b4f0b 100644
--- a/public/components/integrations/components/setup_integration.tsx
+++ b/public/components/integrations/components/setup_integration.tsx
@@ -15,7 +15,6 @@ import {
   EuiForm,
   EuiFormRow,
   EuiLoadingDashboards,
-  EuiModal,
   EuiPage,
   EuiPageBody,
   EuiPageContent,
@@ -320,6 +319,7 @@ export function SetupBottomBar({
             iconType="arrowRight"
             iconSide="right"
             isLoading={loading}
+            disabled={config.displayName.length < 1 || config.connectionDataSource.length < 1}
             onClick={async () => {
               setLoading(true);