diff --git a/src/components/views/right_panel/UserInfo.tsx b/src/components/views/right_panel/UserInfo.tsx
index e50e71535d..3c35a55395 100644
--- a/src/components/views/right_panel/UserInfo.tsx
+++ b/src/components/views/right_panel/UserInfo.tsx
@@ -188,7 +188,7 @@ function DeviceItem({userId, device}: {userId: string, device: IDevice}) {
     };
 
     let deviceName;
-    if (device.getDisplayName() === null || device.getDisplayName().trim() === "") {
+    if (!device.getDisplayName()?.trim()) {
         deviceName = device.deviceId;
     } else {
         deviceName = device.ambiguous ?