diff --git a/src/murfey/server/api/__init__.py b/src/murfey/server/api/__init__.py
index 89a1b5cbb..c6e24c9cb 100644
--- a/src/murfey/server/api/__init__.py
+++ b/src/murfey/server/api/__init__.py
@@ -167,8 +167,8 @@ def get_instrument_display_name(instrument_name: str) -> str:
     machine_config = get_machine_config(instrument_name=instrument_name)[
         instrument_name
     ]
-    if machine_config.get(instrument_name):
-        return machine_config[instrument_name].display_name
+    if machine_config:
+        return machine_config.display_name
     return ""
 
 
diff --git a/src/murfey/server/websocket.py b/src/murfey/server/websocket.py
index 0680c778b..f6f5302a4 100644
--- a/src/murfey/server/websocket.py
+++ b/src/murfey/server/websocket.py
@@ -137,7 +137,7 @@ async def websocket_connection_endpoint(
             except Exception:
                 await manager.broadcast(f"Client #{client_id} sent message {data}")
     except WebSocketDisconnect:
-        log.info(f"Disconnecting Client {int(sanitise(str(client_id)))}")
+        log.info(f"Disconnecting Client {sanitise(str(client_id))}")
         manager.disconnect(websocket, client_id, unregister_client=False)
         await manager.broadcast(f"Client #{client_id} disconnected")
         await manager.delete_state(f"Client {client_id}")