diff --git a/apps/web/src/app/[locale]/(admin)/events/loading.tsx b/apps/web/src/app/[locale]/(admin)/events/loading.tsx
new file mode 100644
index 000000000..8516dc873
--- /dev/null
+++ b/apps/web/src/app/[locale]/(admin)/events/loading.tsx
@@ -0,0 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
+export default function Loading() {
+  return <Spinner />;
+}
diff --git a/apps/web/src/app/[locale]/(admin)/polls/loading.tsx b/apps/web/src/app/[locale]/(admin)/polls/loading.tsx
new file mode 100644
index 000000000..8516dc873
--- /dev/null
+++ b/apps/web/src/app/[locale]/(admin)/polls/loading.tsx
@@ -0,0 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
+export default function Loading() {
+  return <Spinner />;
+}
diff --git a/apps/web/src/app/[locale]/(admin)/settings/billing/loading.tsx b/apps/web/src/app/[locale]/(admin)/settings/billing/loading.tsx
index 4349ac3a6..8516dc873 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/billing/loading.tsx
+++ b/apps/web/src/app/[locale]/(admin)/settings/billing/loading.tsx
@@ -1,3 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
 export default function Loading() {
-  return null;
+  return <Spinner />;
 }
diff --git a/apps/web/src/app/[locale]/(admin)/settings/loading.tsx b/apps/web/src/app/[locale]/(admin)/settings/loading.tsx
new file mode 100644
index 000000000..8516dc873
--- /dev/null
+++ b/apps/web/src/app/[locale]/(admin)/settings/loading.tsx
@@ -0,0 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
+export default function Loading() {
+  return <Spinner />;
+}
diff --git a/apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx b/apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx
index 4349ac3a6..8516dc873 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx
+++ b/apps/web/src/app/[locale]/(admin)/settings/preferences/loading.tsx
@@ -1,3 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
 export default function Loading() {
-  return null;
+  return <Spinner />;
 }
diff --git a/apps/web/src/app/[locale]/(admin)/settings/profile/loading.tsx b/apps/web/src/app/[locale]/(admin)/settings/profile/loading.tsx
index 4349ac3a6..8516dc873 100644
--- a/apps/web/src/app/[locale]/(admin)/settings/profile/loading.tsx
+++ b/apps/web/src/app/[locale]/(admin)/settings/profile/loading.tsx
@@ -1,3 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
 export default function Loading() {
-  return null;
+  return <Spinner />;
 }
diff --git a/apps/web/src/app/[locale]/loading.tsx b/apps/web/src/app/[locale]/loading.tsx
new file mode 100644
index 000000000..8516dc873
--- /dev/null
+++ b/apps/web/src/app/[locale]/loading.tsx
@@ -0,0 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
+export default function Loading() {
+  return <Spinner />;
+}
diff --git a/apps/web/src/app/[locale]/new/loading.tsx b/apps/web/src/app/[locale]/new/loading.tsx
index 4349ac3a6..8516dc873 100644
--- a/apps/web/src/app/[locale]/new/loading.tsx
+++ b/apps/web/src/app/[locale]/new/loading.tsx
@@ -1,3 +1,5 @@
+import { Spinner } from "@/components/spinner";
+
 export default function Loading() {
-  return null;
+  return <Spinner />;
 }