diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx
index d70eb9fe34b51..c4e7ecc8ab9d9 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/dashboard_panels.tsx
@@ -236,10 +236,13 @@ const EntityStoreDashboardPanelsComponent = () => {
         visible={modal.visible}
         toggle={(visible) => setModalState({ visible })}
         enableStore={enableEntityStore}
-        riskScore={{ disabled: isRiskScoreAvailable, checked: !isRiskScoreAvailable }}
+        riskScore={{
+          canToggle: !isRiskScoreAvailable,
+          checked: true,
+        }}
         entityStore={{
-          disabled: entityStore.status === 'enabled',
-          checked: entityStore.status !== 'enabled',
+          canToggle: entityStore.status !== 'enabled',
+          checked: true,
         }}
       />
     </EuiFlexGroup>
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx
index 888ed8403a4fd..1e33f9443e67d 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.test.tsx
@@ -35,8 +35,8 @@ const defaultProps = {
   visible: true,
   toggle: mockToggle,
   enableStore: mockEnableStore,
-  riskScore: { disabled: false, checked: false },
-  entityStore: { disabled: false, checked: false },
+  riskScore: { canToggle: false, checked: false },
+  entityStore: { canToggle: false, checked: false },
 };
 
 const allEntityEnginePrivileges: EntityAnalyticsPrivileges = {
@@ -149,8 +149,8 @@ describe('EntityStoreEnablementModal', () => {
     it('should show proceed warning when riskScore is enabled but entityStore is disabled and unchecked', () => {
       renderComponent({
         ...defaultProps,
-        riskScore: { disabled: false, checked: false }, // Enabled & Checked
-        entityStore: { disabled: true, checked: false }, // Disabled & Unchecked
+        riskScore: { canToggle: false, checked: false },
+        entityStore: { canToggle: true, checked: false },
       });
       expect(screen.getByText('Please enable at least one option to proceed.')).toBeInTheDocument();
     });
@@ -158,8 +158,8 @@ describe('EntityStoreEnablementModal', () => {
     it('should show proceed warning when entityStore is enabled but riskScore is disabled and unchecked', () => {
       renderComponent({
         ...defaultProps,
-        entityStore: { disabled: false, checked: false }, // Enabled & Checked
-        riskScore: { disabled: true, checked: false }, // Disabled & Unchecked
+        entityStore: { canToggle: false, checked: false },
+        riskScore: { canToggle: true, checked: false },
       });
       expect(screen.getByText('Please enable at least one option to proceed.')).toBeInTheDocument();
     });
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
index 5902182f6c89a..d18aaa9c835cf 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_store/components/enablement_modal.tsx
@@ -48,11 +48,11 @@ interface EntityStoreEnablementModalProps {
   toggle: (visible: boolean) => void;
   enableStore: (enablements: Enablements) => () => void;
   riskScore: {
-    disabled?: boolean;
+    canToggle?: boolean;
     checked?: boolean;
   };
   entityStore: {
-    disabled?: boolean;
+    canToggle?: boolean;
     checked?: boolean;
   };
 }
@@ -60,15 +60,15 @@ interface EntityStoreEnablementModalProps {
 const shouldAllowEnablement = (
   riskScoreEnabled: boolean,
   entityStoreEnabled: boolean,
-  enablements: Enablements
+  userHasEnabled: Enablements
 ) => {
   if (riskScoreEnabled) {
-    return enablements.entityStore;
+    return userHasEnabled.entityStore;
   }
   if (entityStoreEnabled) {
-    return enablements.riskScore;
+    return userHasEnabled.riskScore;
   }
-  return enablements.riskScore || enablements.entityStore;
+  return userHasEnabled.riskScore || userHasEnabled.entityStore;
 };
 
 export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProps> = ({
@@ -88,8 +88,8 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
   const riskEnginePrivileges = useMissingRiskEnginePrivileges();
 
   const enablementOptions = shouldAllowEnablement(
-    !!riskScore.disabled,
-    !!entityStore.disabled,
+    !riskScore.canToggle,
+    !entityStore.canToggle,
     enablements
   );
   const { EnablementModalCallout } = useContractComponents();
@@ -132,7 +132,7 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
               }
               checked={enablements.riskScore}
               disabled={
-                riskScore.disabled ||
+                !riskScore.canToggle ||
                 (!riskEnginePrivileges.isLoading && !riskEnginePrivileges?.hasAllRequiredPrivileges)
               }
               onChange={() => setEnablements((prev) => ({ ...prev, riskScore: !prev.riskScore }))}
@@ -158,7 +158,7 @@ export const EntityStoreEnablementModal: React.FC<EntityStoreEnablementModalProp
                 }
                 checked={enablements.entityStore}
                 disabled={
-                  entityStore.disabled ||
+                  !entityStore.canToggle ||
                   (!isLoadingEntityEnginePrivileges && !entityEnginePrivileges?.has_all_required)
                 }
                 onChange={() =>