diff --git a/keep-ui/features/alerts/alert-change-status/ui/alert-change-status-modal.tsx b/keep-ui/features/alerts/alert-change-status/ui/alert-change-status-modal.tsx
index 5fb86c16fe..f6ede06219 100644
--- a/keep-ui/features/alerts/alert-change-status/ui/alert-change-status-modal.tsx
+++ b/keep-ui/features/alerts/alert-change-status/ui/alert-change-status-modal.tsx
@@ -42,10 +42,6 @@ export function AlertChangeStatusModal({
   const { alertsMutator } = useAlerts();
   const presetsMutator = () => revalidateMultiple(["/preset"]);
 
-  useEffect(() => {
-    setDisposeOnNewAlert(alert && !Array.isArray(alert) ? true : false);
-  }, [alert]);
-
   if (!alert) return null;
 
   const statusOptions = Object.values(Status)
diff --git a/keep-ui/widgets/alerts-table/ui/alert-actions.tsx b/keep-ui/widgets/alerts-table/ui/alert-actions.tsx
index 3e83307fdc..e41fd2e88a 100644
--- a/keep-ui/widgets/alerts-table/ui/alert-actions.tsx
+++ b/keep-ui/widgets/alerts-table/ui/alert-actions.tsx
@@ -142,7 +142,10 @@ export default function AlertActions({
         <AlertChangeStatusModal
           alert={modalAlert}
           presetName="resolve"
-          handleClose={() => setModalAlert(null)}
+          handleClose={() => {
+            setModalAlert(null);
+            clearRowSelection();
+          }}
         />
       )}
       <Button