diff --git a/src/components/services/widget/container.jsx b/src/components/services/widget/container.jsx
index c89047c9..f4d8c13e 100644
--- a/src/components/services/widget/container.jsx
+++ b/src/components/services/widget/container.jsx
@@ -33,5 +33,5 @@ export default function Container({ error = false, children, service }) {
     }));
   }
 
-  return <div className="relative flex flex-row w-full">{visibleChildren.slice(0, 4)}</div>;
+  return <div className="relative flex flex-row w-full">{visibleChildren}</div>;
 }
diff --git a/src/widgets/nextcloud/component.jsx b/src/widgets/nextcloud/component.jsx
index 96de96dc..9bc54dc8 100755
--- a/src/widgets/nextcloud/component.jsx
+++ b/src/widgets/nextcloud/component.jsx
@@ -13,16 +13,20 @@ export default function Component({ service }) {
   if (nextcloudError) {
     return <Container service={service} error={nextcloudError} />;
   }
+  
+  // cpuload & memoryusage were deprecated, dont break existing installs & dont have > 4 blocks total
+  let deprecatedFieldsCount = widget.fields ? widget.fields.includes('cpuload') + widget.fields.includes('memoryusage') : 0;
+  if (widget.fields && widget.fields.length - deprecatedFieldsCount < 4) deprecatedFieldsCount -= 4 - (widget.fields.length - deprecatedFieldsCount);
 
   if (!nextcloudData) {
     return (
       <Container service={service}>
-        <Block label="nextcloud.cpuload" />
-        <Block label="nextcloud.memoryusage" />
+        {widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" />}
+        {widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" />}
         <Block label="nextcloud.freespace" />
         <Block label="nextcloud.activeusers" />
-        <Block label="nextcloud.numfiles" />
-        <Block label="nextcloud.numshares" />
+        {deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" />}
+        {deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" />}
       </Container>
     );
   }
@@ -32,12 +36,12 @@ export default function Component({ service }) {
 
   return (
     <Container service={service}>
-      <Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} />
-      <Block label="nextcloud.memoryusage" value={t("common.percent", { value:memoryUsage })} />
+      {widget.fields?.includes('cpuload') && <Block label="nextcloud.cpuload" value={t("common.percent", { value: nextcloudInfo.system.cpuload[0] })} />}
+      {widget.fields?.includes('memoryusage') && <Block label="nextcloud.memoryusage" value={t("common.percent", { value:memoryUsage })} />}
       <Block label="nextcloud.freespace" value={t("common.bbytes", { value: nextcloudInfo.system.freespace, maximumFractionDigits: 1 })} />
       <Block label="nextcloud.activeusers" value={t("common.number", { value: nextcloudData.ocs.data.activeUsers.last24hours })} />
-      <Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} />
-      <Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} />
+      {deprecatedFieldsCount < 2 && <Block label="nextcloud.numfiles" value={t("common.number", { value: nextcloudInfo.storage.num_files })} />}
+      {deprecatedFieldsCount < 1 && <Block label="nextcloud.numshares" value={t("common.number", { value: nextcloudInfo.shares.num_shares })} />}
     </Container>
   );
 }