diff --git a/frontend/pages/hosts/DeviceUserPage/DeviceUserPage.tsx b/frontend/pages/hosts/DeviceUserPage/DeviceUserPage.tsx
index 779a15e18d..1d840fc271 100644
--- a/frontend/pages/hosts/DeviceUserPage/DeviceUserPage.tsx
+++ b/frontend/pages/hosts/DeviceUserPage/DeviceUserPage.tsx
@@ -69,7 +69,11 @@ const DeviceUserPage = ({
       refetchOnReconnect: false,
       refetchOnWindowFocus: false,
       retry: false,
-      select: (data: IDeviceMappingResponse) => data.device_mapping,
+      select: (data: IDeviceMappingResponse) =>
+        data.device_mapping &&
+        data.device_mapping.filter(
+          (deviceUser) => deviceUser.email && deviceUser.email.length
+        ),
     }
   );
 
@@ -298,7 +302,7 @@ const DeviceUserPage = ({
             ) : (
               <span className={`${baseClass}__device-mapping`}>
                 <span
-                  className="device-user"
+                  className="device-user-list"
                   data-tip
                   data-for="device-user-tooltip"
                 >
diff --git a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx
index 5a682a61bb..9c14ce51c6 100644
--- a/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx
+++ b/frontend/pages/hosts/HostDetailsPage/HostDetailsPage.tsx
@@ -211,7 +211,11 @@ const HostDetailsPage = ({
       refetchOnReconnect: false,
       refetchOnWindowFocus: false,
       retry: false,
-      select: (data: IDeviceMappingResponse) => data.device_mapping,
+      select: (data: IDeviceMappingResponse) =>
+        data.device_mapping &&
+        data.device_mapping.filter(
+          (deviceUser) => deviceUser.email && deviceUser.email.length
+        ),
     }
   );
 
@@ -1027,7 +1031,7 @@ const HostDetailsPage = ({
             ) : (
               <span className={`${baseClass}__device-mapping`}>
                 <span
-                  className="device-user"
+                  className="device-user-list"
                   data-tip
                   data-for="device-user-tooltip"
                 >