diff --git a/src/components/DesktopCard.tsx b/src/components/DesktopCard.tsx
index 66149d4..6568fca 100644
--- a/src/components/DesktopCard.tsx
+++ b/src/components/DesktopCard.tsx
@@ -41,7 +41,11 @@ export default function DesktopCard({ server }: IDesktopCardProps) {
           variant="secondary"
           size="small"
           className="absolute top-[0.556vw] right-[0.556vw] cursor-pointer flex items-center justify-center"
-          onClick={() => setModal(<EditTable table={server} />)}
+          onClick={() => {
+            if (server.status !== "offline") {
+              setModal(<EditTable table={server} />);
+            }
+          }}
         >
           <span className="text-[#7D7D7D] w-[0.972vw] h-[0.972vw]">
             <CogIcon />
diff --git a/src/components/ManagerSelect.tsx b/src/components/ManagerSelect.tsx
index fc8db42..aa6388d 100644
--- a/src/components/ManagerSelect.tsx
+++ b/src/components/ManagerSelect.tsx
@@ -15,12 +15,16 @@ function ManagerSelect({
   data: Manager[];
 }) {
   const [isOpen, setIsOpen] = useState(false);
-  const [selectedManager, setSelectedManager] = useState<Manager | null>(
-    data[0]
-  );
+  const [selectedManager, setSelectedManager] = useState<Manager | null>(null);
   const [position, setPosition] = useState<"top" | "bottom">("bottom");
   const selectRef = useClickAway<HTMLDivElement>(() => setIsOpen(false));
 
+  useEffect(() => {
+    if (data.length > 0 && !selectedManager) {
+      setSelectedManager(data[0]);
+    }
+  }, [data, selectedManager]);
+
   useEffect(() => {
     if (!isOpen || !selectRef.current) return;