diff --git a/src/pages/DeviceSupport.tsx b/src/pages/DeviceSupport.tsx
index c540fc0..4cccac6 100644
--- a/src/pages/DeviceSupport.tsx
+++ b/src/pages/DeviceSupport.tsx
@@ -14,6 +14,7 @@ import { useGlobalState } from "providers";
 import DeviceActions from "device/DeviceActions";
 import { cloneDeep } from "lodash";
 import { FindAvailablePositions } from "pbHelpers/DeviceAvailability";
+import LoadingScreen from "app/LoadingScreen";
 
 interface TabPanelProps {
   children?: React.ReactNode;
@@ -179,6 +180,12 @@ export default function DeviceSupport() {
 			});
 	};
 
+	if (!devicePageData) {
+		return (
+			<LoadingScreen message="Getting device data"/>
+		)
+	}
+
 	return (
 		<PageContainer>
 			<Grid container justifyContent={"space-between"}>