diff --git a/src/renderer/features/servers/components/add-server-form.tsx b/src/renderer/features/servers/components/add-server-form.tsx
index 3f1e7ca7..ad7b874f 100644
--- a/src/renderer/features/servers/components/add-server-form.tsx
+++ b/src/renderer/features/servers/components/add-server-form.tsx
@@ -6,7 +6,7 @@ import { useFocusTrap } from '@mantine/hooks';
 import { closeAllModals } from '@mantine/modals';
 import isElectron from 'is-electron';
 import { nanoid } from 'nanoid/non-secure';
-import { AuthenticationResponse, ServerType } from '/@/renderer/api/types';
+import { AuthenticationResponse } from '/@/renderer/api/types';
 import { useAuthStoreActions } from '/@/renderer/store';
 import { ServerType, toServerType } from '/@/renderer/types';
 import { api } from '/@/renderer/api';
@@ -129,13 +129,13 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
             >
                 <SegmentedControl
                     data={SERVER_TYPES}
-                    disabled={serverLock}
+                    disabled={Boolean(serverLock)}
                     {...form.getInputProps('type')}
                 />
                 <Group grow>
                     <TextInput
                         data-autofocus
-                        disabled={serverLock}
+                        disabled={Boolean(serverLock)}
                         label={t('form.addServer.input', {
                             context: 'name',
                             postProcess: 'titleCase',
@@ -143,7 +143,7 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
                         {...form.getInputProps('name')}
                     />
                     <TextInput
-                        disabled={serverLock}
+                        disabled={Boolean(serverLock)}
                         label={t('form.addServer.input', {
                             context: 'url',
                             postProcess: 'titleCase',
diff --git a/src/renderer/features/window-controls/components/window-controls.tsx b/src/renderer/features/window-controls/components/window-controls.tsx
index e90b43ef..6bfd020d 100644
--- a/src/renderer/features/window-controls/components/window-controls.tsx
+++ b/src/renderer/features/window-controls/components/window-controls.tsx
@@ -35,13 +35,13 @@ export const WindowsButton = styled.div<{ $exit?: boolean }>`
     }
 `;
 
-const close = () => browser.exit();
+const close = () => browser?.exit();
 
-const minimize = () => browser.minimize();
+const minimize = () => browser?.minimize();
 
-const maximize = () => browser.maximize();
+const maximize = () => browser?.maximize();
 
-const unmaximize = () => browser.unmaximize();
+const unmaximize = () => browser?.unmaximize();
 
 export const WindowControls = ({ style }: WindowControlsProps) => {
     const [max, setMax] = useState(false);
diff --git a/src/renderer/layouts/window-bar.tsx b/src/renderer/layouts/window-bar.tsx
index d6db0114..5db9a497 100644
--- a/src/renderer/layouts/window-bar.tsx
+++ b/src/renderer/layouts/window-bar.tsx
@@ -60,10 +60,10 @@ const PlayerStatusContainer = styled.div`
 `;
 
 const browser = isElectron() ? window.electron.browser : null;
-const close = () => browser.exit();
-const minimize = () => browser.minimize();
-const maximize = () => browser.maximize();
-const unmaximize = () => browser.unmaximize();
+const close = () => browser?.exit();
+const minimize = () => browser?.minimize();
+const maximize = () => browser?.maximize();
+const unmaximize = () => browser?.unmaximize();
 
 interface WindowBarControlsProps {
     controls: {
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index bba64186..4d975548 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -1,3 +1,4 @@
+import { ServerFeatures } from '/@/renderer/api/features-types';
 import {
     Album,
     AlbumArtist,
@@ -73,7 +74,7 @@ export const toServerType = (value?: string): ServerType | null => {
 
 export type ServerListItem = {
     credential: string;
-    features?: Record<string, number[]>;
+    features?: ServerFeatures;
     id: string;
     name: string;
     ndCredential?: string;