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 99e2475f95a78..dda65a9ee8122 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
@@ -141,13 +141,14 @@ const EntityStoreDashboardPanelsComponent = () => {
     );
   }
 
-  const isRiskScoreAvailable =
+  // Risk score could be installed but disabled
+  const isRiskScoreInstalled =
     riskEngineStatus.data &&
     riskEngineStatus.data.risk_engine_status !== RiskEngineStatusEnum.NOT_INSTALLED;
 
   return (
     <EuiFlexGroup direction="column" data-test-subj="entityStorePanelsGroup">
-      {entityStore.status === 'error' && isRiskScoreAvailable && (
+      {entityStore.status === 'stopped' && isRiskScoreInstalled && (
         <>
           {callouts}
           <EuiFlexItem>
@@ -158,7 +159,19 @@ const EntityStoreDashboardPanelsComponent = () => {
           </EuiFlexItem>
         </>
       )}
-      {entityStore.status === 'error' && !isRiskScoreAvailable && (
+
+      {entityStore.status === 'error' && isRiskScoreInstalled && (
+        <>
+          {callouts}
+          <EuiFlexItem>
+            <EntityAnalyticsRiskScores riskEntity={RiskScoreEntity.user} />
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EntityAnalyticsRiskScores riskEntity={RiskScoreEntity.host} />
+          </EuiFlexItem>
+        </>
+      )}
+      {entityStore.status === 'error' && !isRiskScoreInstalled && (
         <>
           {callouts}
           <EuiFlexItem>
@@ -170,7 +183,7 @@ const EntityStoreDashboardPanelsComponent = () => {
           </EuiFlexItem>
         </>
       )}
-      {entityStore.status === 'enabled' && isRiskScoreAvailable && (
+      {entityStore.status === 'enabled' && isRiskScoreInstalled && (
         <>
           <EuiFlexItem>
             <EntityAnalyticsRiskScores riskEntity={RiskScoreEntity.user} />
@@ -183,7 +196,7 @@ const EntityStoreDashboardPanelsComponent = () => {
           </EuiFlexItem>
         </>
       )}
-      {entityStore.status === 'enabled' && !isRiskScoreAvailable && (
+      {entityStore.status === 'enabled' && !isRiskScoreInstalled && (
         <>
           <EuiFlexItem>
             <EnableEntityStore
@@ -199,7 +212,7 @@ const EntityStoreDashboardPanelsComponent = () => {
         </>
       )}
 
-      {entityStore.status === 'not_installed' && !isRiskScoreAvailable && (
+      {entityStore.status === 'not_installed' && !isRiskScoreInstalled && (
         // TODO: Move modal inside EnableEntityStore component, eliminating the onEnable prop in favour of forwarding the riskScoreEnabled status
         <EnableEntityStore
           enablements="both"
@@ -208,7 +221,7 @@ const EntityStoreDashboardPanelsComponent = () => {
         />
       )}
 
-      {entityStore.status === 'not_installed' && isRiskScoreAvailable && (
+      {entityStore.status === 'not_installed' && isRiskScoreInstalled && (
         <>
           <EuiFlexItem>
             <EnableEntityStore
@@ -233,7 +246,7 @@ const EntityStoreDashboardPanelsComponent = () => {
         visible={modal.visible}
         toggle={(visible) => setModalState({ visible })}
         enableStore={enableEntityStore}
-        riskScore={{ disabled: isRiskScoreAvailable, checked: !isRiskScoreAvailable }}
+        riskScore={{ disabled: isRiskScoreInstalled, checked: !isRiskScoreInstalled }}
         entityStore={{
           disabled: entityStore.status === 'enabled',
           checked: entityStore.status !== 'enabled',