diff --git a/interface/src/project/DashboardDevices.tsx b/interface/src/project/DashboardDevices.tsx
index f59047e3f..d95bc9f3a 100644
--- a/interface/src/project/DashboardDevices.tsx
+++ b/interface/src/project/DashboardDevices.tsx
@@ -94,8 +94,14 @@ const DashboardDevices: FC = () => {
   }, []);
 
   const leftOffset = () => {
-    const left = document.getElementById('devices-window')?.getBoundingClientRect().left;
-    const right = document.getElementById('devices-window')?.getBoundingClientRect().right;
+    const devicesWindow = document.getElementById('devices-window');
+    if (!devicesWindow) {
+      return 0;
+    }
+
+    const clientRect = devicesWindow.getBoundingClientRect();
+    const left = clientRect.left;
+    const right = clientRect.right;
 
     if (!left || !right) {
       return 0;
@@ -416,11 +422,11 @@ const DashboardDevices: FC = () => {
   const renderCoreData = () => (
     <IconContext.Provider value={{ color: 'lightblue', size: '24', style: { verticalAlign: 'middle' } }}>
       {!coreData.connected && <MessageBox my={2} level="error" message={LL.EMS_BUS_WARNING()} />}
-      {coreData.connected && coreData.devices.length === 0 && (
+      {/* {coreData.connected && coreData.devices.length === 0 && (
         <MessageBox my={2} level="warning" message={LL.EMS_BUS_SCANNING()} />
-      )}
+      )} */}
 
-      {coreData.devices.length !== 0 && (
+      {coreData.connected && (
         <Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}>
           {(tableList: any) => (
             <>