From 04c5d0df393e497ef250cf7e8abc4a00994db379 Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Wed, 7 Jan 2026 17:15:38 +0100
Subject: [PATCH 1/2] remove state change before removal

---
 .../components/UpdateInstanceModalForm.tsx                  | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/client/pages/ClientInstancePage/modals/UpdateInstanceModal/components/UpdateInstanceModalForm.tsx b/src/pages/client/pages/ClientInstancePage/modals/UpdateInstanceModal/components/UpdateInstanceModalForm.tsx
index 1b684680..cae2a283 100644
--- a/src/pages/client/pages/ClientInstancePage/modals/UpdateInstanceModal/components/UpdateInstanceModalForm.tsx
+++ b/src/pages/client/pages/ClientInstancePage/modals/UpdateInstanceModal/components/UpdateInstanceModalForm.tsx
@@ -4,7 +4,6 @@ import { fetch } from '@tauri-apps/plugin-http';
 import { useMemo } from 'react';
 import { type SubmitHandler, useForm } from 'react-hook-form';
 import { z } from 'zod';
-import { shallow } from 'zustand/shallow';
 import { useI18nContext } from '../../../../../../../i18n/i18n-react';
 import { FormInput } from '../../../../../../../shared/defguard-ui/components/Form/FormInput/FormInput';
 import { Button } from '../../../../../../../shared/defguard-ui/components/Layout/Button/Button';
@@ -40,7 +39,6 @@ export const UpdateInstanceModalForm = () => {
   const closeModal = useUpdateInstanceModal((state) => state.close);
   const toaster = useToaster();
   const queryClient = useQueryClient();
-  const setClientState = useClientStore((s) => s.setState, shallow);
   const platformInfo = useClientStore((state) => state.platformInfo);
 
   const defaultValues = useMemo(
@@ -226,10 +224,6 @@ export const UpdateInstanceModalForm = () => {
           text={localLL.controls.removeInstance()}
           onClick={() => {
             if (instance) {
-              setClientState({
-                selectedInstance: undefined,
-                selectedLocation: undefined,
-              });
               openDeleteInstance(instance);
             }
           }}

From 0cecd6785761dc24482f86dc7220dfb0dae03ab7 Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Wed, 7 Jan 2026 17:33:09 +0100
Subject: [PATCH 2/2] set state if instance exists

---
 .../modals/DeleteInstanceModal/DeleteInstanceModal.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/client/pages/ClientInstancePage/modals/DeleteInstanceModal/DeleteInstanceModal.tsx b/src/pages/client/pages/ClientInstancePage/modals/DeleteInstanceModal/DeleteInstanceModal.tsx
index f743919c..fb532e3b 100644
--- a/src/pages/client/pages/ClientInstancePage/modals/DeleteInstanceModal/DeleteInstanceModal.tsx
+++ b/src/pages/client/pages/ClientInstancePage/modals/DeleteInstanceModal/DeleteInstanceModal.tsx
@@ -49,7 +49,6 @@ export const DeleteInstanceModal = () => {
           refetchType: 'active',
         });
       });
-      setClientStore({ selectedInstance: undefined, selectedLocation: undefined });
       close();
       closeUpdate();
     },
@@ -83,6 +82,7 @@ export const DeleteInstanceModal = () => {
       cancelText={LL.common.controls.cancel()}
       onSubmit={() => {
         if (instance) {
+          setClientStore({ selectedInstance: undefined, selectedLocation: undefined });
           mutate(instance.id);
         }
       }}