diff --git a/src/widgets/omada/component.jsx b/src/widgets/omada/component.jsx
index d0565e43c..c4da60677 100644
--- a/src/widgets/omada/component.jsx
+++ b/src/widgets/omada/component.jsx
@@ -17,12 +17,20 @@ export default function Component({ service }) {
     return <Container service={service} error={omadaAPIError} />;
   }
 
+  if (!widget.fields) {
+    widget.fields = ["connectedAp", "activeUser", "alerts", "connectedGateway"];
+  } else if (widget.fields?.length > 4) {
+    widget.fields = widget.fields.slice(0, 4);
+  }
+
   if (!omadaData) {
     return (
       <Container service={service}>
         <Block label="omada.connectedAp" />
         <Block label="omada.activeUser" />
         <Block label="omada.alerts" />
+        <Block label="omada.connectedGateway" />
+        <Block label="omada.connectedSwitches" />
       </Container>
     );
   }
@@ -32,9 +40,8 @@ export default function Component({ service }) {
       <Block label="omada.connectedAp" value={t("common.number", { value: omadaData.connectedAp })} />
       <Block label="omada.activeUser" value={t("common.number", { value: omadaData.activeUser })} />
       <Block label="omada.alerts" value={t("common.number", { value: omadaData.alerts })} />
-      {omadaData.connectedGateways > 0 && (
-        <Block label="omada.connectedGateway" value={t("common.number", { value: omadaData.connectedGateways })} />
-      )}
+      <Block label="omada.connectedGateway" value={t("common.number", { value: omadaData.connectedGateways })} />
+      <Block label="omada.connectedSwitches" value={t("common.number", { value: omadaData.connectedSwitches })} />
     </Container>
   );
 }