diff --git a/packages/translation/src/lang/en.json b/packages/translation/src/lang/en.json
index 6537ed32e..cc5d5e0fa 100644
--- a/packages/translation/src/lang/en.json
+++ b/packages/translation/src/lang/en.json
@@ -5773,6 +5773,7 @@
       },
       "card": {
         "internet": "Internet",
+        "isp": "ISP",
         "latency": "{value} ms",
         "measuredAt": "Measured at {time}",
         "clients": "Clients",
diff --git a/packages/widgets/src/unifi-os/component.tsx b/packages/widgets/src/unifi-os/component.tsx
index 33e6405eb..cc05fc86b 100644
--- a/packages/widgets/src/unifi-os/component.tsx
+++ b/packages/widgets/src/unifi-os/component.tsx
@@ -86,9 +86,14 @@ export default function UnifiOsWidget({ integrationIds, options }: WidgetCompone
         {options.showIsp && (
           <Group justify="space-between" wrap="nowrap" gap="xs">
             {summary.wan.isp === null ? (
-              <Text size="xs" c="dimmed">
-                {EMPTY_VALUE}
-              </Text>
+              <>
+                <Text size="xs" c="dimmed">
+                  {t("widget.unifiOs.card.isp")}
+                </Text>
+                <Text size="xs" c="dimmed">
+                  {EMPTY_VALUE}
+                </Text>
+              </>
             ) : (
               <>
                 <Text size="xs" c="dimmed" truncate>
@@ -166,11 +171,13 @@ export default function UnifiOsWidget({ integrationIds, options }: WidgetCompone
         <Text size="xs" c="dimmed" truncate>
           {t("widget.unifiOs.card.version", { version: summary.site.applicationVersion })}
         </Text>
-        <Text size="xs" c="dimmed">
-          {t("widget.unifiOs.card.gatewayUptime", {
-            uptime: summary.gateway?.uptimeSec != null ? formatUptime(summary.gateway.uptimeSec) : EMPTY_VALUE,
-          })}
-        </Text>
+        {(summary.devices === null || summary.gateway !== null) && (
+          <Text size="xs" c="dimmed">
+            {t("widget.unifiOs.card.gatewayUptime", {
+              uptime: summary.gateway?.uptimeSec != null ? formatUptime(summary.gateway.uptimeSec) : EMPTY_VALUE,
+            })}
+          </Text>
+        )}
       </Group>
     </Stack>
   );