diff --git a/webapp/src/ai_integration.ts b/webapp/src/ai_integration.ts
index 3aea200f35..19ac12832a 100644
--- a/webapp/src/ai_integration.ts
+++ b/webapp/src/ai_integration.ts
@@ -23,7 +23,7 @@ export const useAIStatusUpdateClicked = () => {
 export const useAIAvailableBots = () => {
     return useSelector<GlobalState, any[]>((state) => {
         //@ts-ignore plugins state is a thing
-        return state['plugins-' + aiPluginID]?.bots;
+        return state['plugins-' + aiPluginID]?.bots || [];
     });
 };
 
diff --git a/webapp/src/components/modals/ai_modal.tsx b/webapp/src/components/modals/ai_modal.tsx
index 320017702e..8e72356f2e 100644
--- a/webapp/src/components/modals/ai_modal.tsx
+++ b/webapp/src/components/modals/ai_modal.tsx
@@ -245,6 +245,7 @@ const AIModalContainer = styled.div`
     right: -2px;
     top: -10px;
     position: absolute;
+    z-index: 1000;
     background: var(--center-channel-bg);
     border: 1px solid var(--center-channel-color-16);
     border-radius: 4px;
diff --git a/webapp/src/components/modals/update_run_status_modal.tsx b/webapp/src/components/modals/update_run_status_modal.tsx
index f3f6b437d9..516d1ab743 100644
--- a/webapp/src/components/modals/update_run_status_modal.tsx
+++ b/webapp/src/components/modals/update_run_status_modal.tsx
@@ -25,7 +25,7 @@ import GenericModal, {Description, Label} from 'src/components/widgets/generic_m
 import UnsavedChangesModal from 'src/components/widgets/unsaved_changes_modal';
 import IconAI from 'src/components/assets/icons/ai';
 import AIModal from 'src/components/modals/ai_modal';
-import {useAIAvailable} from 'src/ai_integration';
+import {useAIAvailable, useAIAvailableBots} from 'src/ai_integration';
 
 import {
     Mode,
@@ -109,6 +109,7 @@ const UpdateRunStatusModal = ({
     const currentUserId = useSelector(getCurrentUserId);
     const [aiModalOpen, setAIModalOpen] = useState(false);
     const aiAvailable = useAIAvailable();
+    const aiAvailableBots = useAIAvailableBots();
     const {data} = useQuery(runStatusModalQueryDocument, {
         variables: {
             runID: playbookRunId,
@@ -269,7 +270,7 @@ const UpdateRunStatusModal = ({
               <Label>
                   {formatMessage({defaultMessage: 'Change since last update'})}
               </Label>
-              { aiAvailable &&
+              { aiAvailable && aiAvailableBots.length > 0 &&
                 (aiModalOpen ? (
                   <TertiaryButton onClick={() => {
                     setAIModalOpen(true);
@@ -287,7 +288,7 @@ const UpdateRunStatusModal = ({
                 ))
               }
             </LastChangeSince>
-            { aiAvailable &&
+            { aiAvailable && aiAvailableBots.length > 0 &&
               <AiModalContainer>
                 <AIModal
                   playbookRunId={playbookRunId}