diff --git a/frontend/src/ServerManager.jsx b/frontend/src/ServerManager.jsx
index f92b328..d5377fb 100644
--- a/frontend/src/ServerManager.jsx
+++ b/frontend/src/ServerManager.jsx
@@ -533,7 +533,9 @@ function EditServerModal({ show, server, onChange, onSave, onClose }) {
       const handler = () => onClose && onClose();
       modalRef.current.addEventListener('hide.bs.modal', handler);
       return () => {
-        modalRef.current.removeEventListener('hide.bs.modal', handler);
+        if (modalRef.current) {
+          modalRef.current.removeEventListener('hide.bs.modal', handler);
+        }
       };
     }
   }, [show, onClose]);
@@ -600,7 +602,9 @@ function DeleteServerModal({ show, server, onDelete, onClose }) {
       const handler = () => onClose && onClose();
       modalRef.current.addEventListener('hide.bs.modal', handler);
       return () => {
-        modalRef.current.removeEventListener('hide.bs.modal', handler);
+        if (modalRef.current) {
+          modalRef.current.removeEventListener('hide.bs.modal', handler);
+        }
       };
     }
   }, [show, onClose]);