diff --git a/Common/UI/Components/EditionLabel/EditionLabel.tsx b/Common/UI/Components/EditionLabel/EditionLabel.tsx
index bca1dfc0ce..ab21d73b2a 100644
--- a/Common/UI/Components/EditionLabel/EditionLabel.tsx
+++ b/Common/UI/Components/EditionLabel/EditionLabel.tsx
@@ -304,6 +304,32 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
     }
   };
 
+  const shouldShowEnterpriseValidationButton: boolean =
+    IS_ENTERPRISE_EDITION && !licenseValid;
+
+  const modalSubmitButtonText: string | undefined = IS_ENTERPRISE_EDITION
+    ? shouldShowEnterpriseValidationButton
+      ? "Validate License"
+      : undefined
+    : "Talk to Sales";
+
+  const modalOnSubmit: (() => void) | undefined = IS_ENTERPRISE_EDITION
+    ? shouldShowEnterpriseValidationButton
+      ? handleValidateClick
+      : undefined
+    : handlePrimaryAction;
+
+  const modalIsLoading: boolean =
+    IS_ENTERPRISE_EDITION && shouldShowEnterpriseValidationButton
+      ? isValidating
+      : false;
+
+  const modalDisableSubmitButton: boolean | undefined = IS_ENTERPRISE_EDITION
+    ? shouldShowEnterpriseValidationButton
+      ? !licenseKeyInput.trim() || isValidating || isConfigLoading
+      : undefined
+    : false;
+
   return (
     <>
       <button
@@ -326,21 +352,13 @@ const EditionLabel: FunctionComponent<ComponentProps> = (
       {isDialogOpen && (
         <Modal
           title={editionName}
-          submitButtonText={
-            IS_ENTERPRISE_EDITION ? "Validate License" : "Talk to Sales"
-          }
+          submitButtonText={modalSubmitButtonText}
           closeButtonText="Close"
           onClose={closeDialog}
-          onSubmit={
-            IS_ENTERPRISE_EDITION ? handleValidateClick : handlePrimaryAction
-          }
+          onSubmit={modalOnSubmit}
           modalWidth={ModalWidth.Large}
-          isLoading={IS_ENTERPRISE_EDITION ? isValidating : false}
-          disableSubmitButton={
-            IS_ENTERPRISE_EDITION
-              ? !licenseKeyInput.trim() || isValidating || isConfigLoading
-              : false
-          }
+          isLoading={modalIsLoading}
+          disableSubmitButton={modalDisableSubmitButton}
           isBodyLoading={IS_ENTERPRISE_EDITION ? isConfigLoading : false}
         >
           <div className="space-y-3 text-sm text-gray-600">
diff --git a/Common/UI/Components/Modal/Modal.tsx b/Common/UI/Components/Modal/Modal.tsx
index 828224ef05..92b5f6ea79 100644
--- a/Common/UI/Components/Modal/Modal.tsx
+++ b/Common/UI/Components/Modal/Modal.tsx
@@ -20,7 +20,7 @@ export interface ComponentProps {
   children: Array<ReactElement> | ReactElement;
   onClose?: undefined | (() => void);
   submitButtonText?: undefined | string;
-  onSubmit: () => void;
+  onSubmit?: (() => void) | undefined;
   submitButtonStyleType?: undefined | ButtonStyleType;
   submitButtonType?: undefined | ButtonType;
   closeButtonStyleType?: undefined | ButtonStyleType;
diff --git a/Common/UI/Components/Modal/ModalFooter.tsx b/Common/UI/Components/Modal/ModalFooter.tsx
index 7f7fbaa6aa..3c1bba7d86 100644
--- a/Common/UI/Components/Modal/ModalFooter.tsx
+++ b/Common/UI/Components/Modal/ModalFooter.tsx
@@ -5,7 +5,7 @@ import React, { FunctionComponent, ReactElement } from "react";
 export interface ComponentProps {
   onClose?: undefined | (() => void) | undefined;
   submitButtonText?: undefined | string;
-  onSubmit: () => void;
+  onSubmit?: (() => void) | undefined;
   submitButtonStyleType?: undefined | ButtonStyleType;
   closeButtonStyleType?: undefined | ButtonStyleType;
   submitButtonType?: undefined | ButtonType;
@@ -30,7 +30,7 @@ const ModalFooter: FunctionComponent<ComponentProps> = (
             props.submitButtonText ? props.submitButtonText : "Save Changes"
           }
           onClick={() => {
-            props.onSubmit();
+            props.onSubmit?.();
           }}
           disabled={props.disableSubmitButton || false}
           isLoading={props.isLoading || false}