diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx
index 253cb05e2..ad84505c9 100644
--- a/resources/scripts/components/server/ServerConsole.tsx
+++ b/resources/scripts/components/server/ServerConsole.tsx
@@ -75,7 +75,7 @@ export default () => {
                                 status === 'offline' ? tw`text-red-500` : (status === 'running' ? tw`text-green-500` : tw`text-yellow-500`),
                             ]}
                         />
-                         {status}
+                         {!status ? 'Connecting...' : status}
                     </p>
                     <p css={tw`text-xs mt-2`}>
                         <FontAwesomeIcon icon={faMicrochip} fixedWidth css={tw`mr-1`}/> {cpu.toFixed(2)}%
@@ -112,6 +112,7 @@ export default () => {
                                     size={'xsmall'}
                                     isSecondary
                                     css={tw`mr-2`}
+                                    disabled={!status}
                                     onClick={e => {
                                         e.preventDefault();
                                         sendPowerCommand('restart');
diff --git a/resources/scripts/components/server/StopOrKillButton.tsx b/resources/scripts/components/server/StopOrKillButton.tsx
index ee9d40d2d..605ca397e 100644
--- a/resources/scripts/components/server/StopOrKillButton.tsx
+++ b/resources/scripts/components/server/StopOrKillButton.tsx
@@ -16,7 +16,7 @@ const StopOrKillButton = ({ onPress }: { onPress: (action: PowerAction) => void
         <Button
             color={'red'}
             size={'xsmall'}
-            disabled={status === 'offline'}
+            disabled={!status || status === 'offline'}
             onClick={e => {
                 e.preventDefault();
                 onPress(clicked ? 'kill' : 'stop');
diff --git a/resources/scripts/state/server/index.ts b/resources/scripts/state/server/index.ts
index f6c8136e4..98a79fa03 100644
--- a/resources/scripts/state/server/index.ts
+++ b/resources/scripts/state/server/index.ts
@@ -8,7 +8,7 @@ import schedules, { ServerScheduleStore } from '@/state/server/schedules';
 import databases, { ServerDatabaseStore } from '@/state/server/databases';
 import isEqual from 'react-fast-compare';
 
-export type ServerStatus = 'offline' | 'starting' | 'stopping' | 'running';
+export type ServerStatus = 'offline' | 'starting' | 'stopping' | 'running' | null;
 
 interface ServerDataStore {
     data?: Server;
@@ -56,7 +56,7 @@ interface ServerStatusStore {
 }
 
 const status: ServerStatusStore = {
-    value: 'offline',
+    value: null,
     setServerStatus: action((state, payload) => {
         state.value = payload;
     }),