diff --git a/public/locales/en/common.json b/public/locales/en/common.json
index 80ba5357e..6081a71e6 100644
--- a/public/locales/en/common.json
+++ b/public/locales/en/common.json
@@ -372,5 +372,9 @@
     "paperlessngx": {
         "inbox": "Inbox",
         "total": "Total"
+    },
+    "nextdns": {
+        "wait": "Please Wait",
+        "no_devices": "No Device Data Received"
     }
 }
\ No newline at end of file
diff --git a/src/widgets/nextdns/component.jsx b/src/widgets/nextdns/component.jsx
index 75ef04f01..ae2397701 100644
--- a/src/widgets/nextdns/component.jsx
+++ b/src/widgets/nextdns/component.jsx
@@ -18,14 +18,22 @@ export default function Component({ service }) {
   if (!nextdnsData) {
     return (
       <Container service={service}>
-        No data
+        <Block key="status" label="widget.status" value={t("nextdns.wait")} />
+      </Container>
+    );
+  }
+
+  if (!nextdnsData?.data?.length) {
+    return (
+      <Container service={service}>
+        <Block key="status" label="widget.status" value={t("nextdns.no_devices")} />
       </Container>
     );
   }
 
   return (
     <Container service={service}>
-      {nextdnsData?.data?.map(d => <Block key={d.status} label={d.status} value={t("common.number", { value: d.queries })} />)}
+      {nextdnsData.data.map(d => <Block key={d.status} label={d.status} value={t("common.number", { value: d.queries })} />)}
     </Container>
   );
 }