diff --git a/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx b/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx
index c5f42dfb0..efd0a41ce 100644
--- a/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx
+++ b/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx
@@ -55,7 +55,7 @@ export function ActiveIncidentsActionsColumn({
   return (
     <>
       <Button
-        disabled={isDispatch ? !hasActiveDispatchers : !isUnitActive}
+        isDisabled={isDispatch ? !hasActiveDispatchers : !isUnitActive}
         size="xs"
         variant="success"
         onPress={() => onEditClick(incident)}
@@ -66,7 +66,7 @@ export function ActiveIncidentsActionsColumn({
       {isDispatch ? (
         <Button
           onPress={() => onEndClick(incident)}
-          disabled={!hasActiveDispatchers}
+          isDisabled={!hasActiveDispatchers}
           size="xs"
           variant="danger"
           className="ml-2"
@@ -76,7 +76,7 @@ export function ActiveIncidentsActionsColumn({
       ) : (
         <Button
           className="ml-2"
-          disabled={!isUnitActive}
+          isDisabled={!isUnitActive}
           size="xs"
           onPress={() =>
             unit &&
diff --git a/apps/client/src/pages/officer/index.tsx b/apps/client/src/pages/officer/index.tsx
index 4603321b0..0850f4b7f 100644
--- a/apps/client/src/pages/officer/index.tsx
+++ b/apps/client/src/pages/officer/index.tsx
@@ -155,7 +155,7 @@ export default function OfficerDashboard({
   }));
   const set911Calls = useCall911State((state) => state.setCalls);
   const t = useTranslations("Leo");
-  const { ACTIVE_WARRANTS, CALLS_911 } = useFeatureEnabled();
+  const { ACTIVE_INCIDENTS, ACTIVE_WARRANTS, CALLS_911 } = useFeatureEnabled();
   const { user } = useAuth();
   const session = user ?? _session;
 
@@ -199,7 +199,7 @@ export default function OfficerDashboard({
     },
     {
       type: DashboardLayoutCardType.ACTIVE_INCIDENTS,
-      isEnabled: true,
+      isEnabled: ACTIVE_INCIDENTS,
       children: <ActiveIncidents />,
     },
   ];