diff --git a/src/app/services/device.service.ts b/src/app/services/device.service.ts
index a988af366..f2a37d33f 100644
--- a/src/app/services/device.service.ts
+++ b/src/app/services/device.service.ts
@@ -39,6 +39,11 @@ export class DeviceService {
     } else {
       // Set connected
       device.connected = this.sysConns.connections[device.deviceID].connected;
+
+      // TODO ? temporarily set to connected
+      if (device.deviceID === this.thisDevice.deviceID) {
+        device.connected = true;
+      }
     }
 
     this.dbCompletionService.getDeviceCompletion(device.deviceID).subscribe(