diff --git a/package-lock.json b/package-lock.json
index 53fe08a3f..6176d8b75 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,16 +1,16 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "2.44.0",
+  "version": "2.45.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@gisce/react-ooui",
-      "version": "2.44.0",
+      "version": "2.45.0",
       "dependencies": {
         "@ant-design/plots": "^1.0.9",
         "@gisce/fiber-diagram": "2.1.1",
-        "@gisce/ooui": "2.20.0",
+        "@gisce/ooui": "2.21.0",
         "@gisce/react-formiga-components": "1.8.0",
         "@gisce/react-formiga-table": "1.8.5",
         "@monaco-editor/react": "^4.4.5",
@@ -3370,9 +3370,9 @@
       }
     },
     "node_modules/@gisce/ooui": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.20.0.tgz",
-      "integrity": "sha512-IeoZ55dM7vwVebUtLm2oxSCbGbKwxEYCjl7PO6ZAlpjvtWyXy7dVHLo+fT/90gnAO1XlT6sCRCORJhtbGy5d9A==",
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/@gisce/ooui/-/ooui-2.21.0.tgz",
+      "integrity": "sha512-ft6G/o2hUb74BQPpDRomZIJ28B625INSFFYUECGHKJwy0C00RwnKvA4jX7lodtxdMrAtARneKeihPoy5bRSsnQ==",
       "dependencies": {
         "@gisce/conscheck": "1.0.9",
         "html-entities": "^2.3.3",
diff --git a/package.json b/package.json
index b64c7a440..8a2291f52 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "2.44.0",
+  "version": "2.45.0",
   "engines": {
     "node": "20.5.0"
   },
@@ -35,7 +35,7 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "2.1.1",
-    "@gisce/ooui": "2.20.0",
+    "@gisce/ooui": "2.21.0",
     "@gisce/react-formiga-components": "1.8.0",
     "@gisce/react-formiga-table": "1.8.5",
     "@monaco-editor/react": "^4.4.5",
diff --git a/src/locales/ca_ES.ts b/src/locales/ca_ES.ts
index c5e290cce..17a55e751 100644
--- a/src/locales/ca_ES.ts
+++ b/src/locales/ca_ES.ts
@@ -107,4 +107,5 @@ export default {
   applyFilters: "Aplicar filtres",
   resetTableView: "Restablir vista de taula",
   not: "No",
+  loading: "Carregant...",
 };
diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts
index 8c32221a3..84e25139c 100644
--- a/src/locales/en_US.ts
+++ b/src/locales/en_US.ts
@@ -103,4 +103,5 @@ export default {
   applyFilters: "Apply filters",
   resetTableView: "Reset table view",
   not: "Not",
+  loading: "Loading...",
 };
diff --git a/src/locales/es_ES.ts b/src/locales/es_ES.ts
index f517b042d..7f1dfe1dd 100644
--- a/src/locales/es_ES.ts
+++ b/src/locales/es_ES.ts
@@ -109,4 +109,5 @@ export default {
   applyFilters: "Aplicar filtros",
   resetTableView: "Restablecer vista de tabla",
   not: "No",
+  loading: "Cargando...",
 };
diff --git a/src/widgets/containers/Group.tsx b/src/widgets/containers/Group.tsx
index cde5c6a32..6639d04bd 100644
--- a/src/widgets/containers/Group.tsx
+++ b/src/widgets/containers/Group.tsx
@@ -1,8 +1,7 @@
 import React from "react";
 import { Group as GroupOoui } from "@gisce/ooui";
-import Container from "./Container";
-import { FieldSet } from "@gisce/react-formiga-components";
-import { Space } from "antd";
+import { Spinner } from "@/widgets/custom/Spinner";
+import { FieldSet , useLocale } from "@gisce/react-formiga-components";
 import iconMapper from "@/helpers/iconMapper";
 
 type Props = {
@@ -14,19 +13,21 @@ type Props = {
 function Group(props: Props): React.ReactElement {
   const { ooui, showLabel = true, responsiveBehaviour } = props;
   const icon: React.ElementType | undefined = iconMapper(ooui.icon || "");
-
+  const { t } = useLocale();
   return (
     <>
       {(ooui.label || icon) && showLabel ? (
         <FieldSet label={ooui.label} icon={icon}>
-          <Container
-            container={ooui!.container}
+          <Spinner
+            tip={t("loading")}
+            ooui={ooui}
             responsiveBehaviour={responsiveBehaviour}
           />
         </FieldSet>
       ) : (
-        <Container
-          container={ooui!.container}
+        <Spinner
+          tip={t("loading")}
+          ooui={ooui}
           responsiveBehaviour={responsiveBehaviour}
         />
       )}
diff --git a/src/widgets/custom/Spinner.tsx b/src/widgets/custom/Spinner.tsx
index 4d9cbc631..8d2aa396c 100644
--- a/src/widgets/custom/Spinner.tsx
+++ b/src/widgets/custom/Spinner.tsx
@@ -1,19 +1,23 @@
-import React from "react";
 import { WidgetProps } from "@/types";
 import { Spinner as SpinnerOoui } from "@gisce/ooui";
 import { Spin } from "antd";
 import Container from "@/widgets/containers/Container";
 
-type SpinnerProps = WidgetProps & {
+type SpinnerProps = Omit<WidgetProps, "ooui"> & {
   ooui: SpinnerOoui;
+  responsiveBehaviour?: boolean;
+  tip?: string;
 };
 
 export const Spinner = (props: SpinnerProps) => {
-  const { ooui } = props;
+  const { ooui, responsiveBehaviour = false, tip } = props;
 
   return (
-    <Spin tip={ooui.label} size="large" spinning={ooui.loading}>
-      <Container container={ooui.container} responsiveBehaviour={false} />
+    <Spin tip={tip ?? ooui.label} size="large" spinning={ooui.loading}>
+      <Container
+        container={ooui.container}
+        responsiveBehaviour={responsiveBehaviour}
+      />
     </Spin>
   );
 };