diff --git a/packages/web-app-files/src/extensionPoints.ts b/packages/web-app-files/src/extensionPoints.ts
index 22f439113e..2d53bef30b 100644
--- a/packages/web-app-files/src/extensionPoints.ts
+++ b/packages/web-app-files/src/extensionPoints.ts
@@ -97,6 +97,11 @@ export const folderViewsSearchExtensionPoint: ExtensionPoint<FolderViewExtension
   extensionType: 'folderView'
 }
 
+export const genericSpaceHeaderExtensionPoint: ExtensionPoint<CustomComponentExtension> = {
+  id: 'app.files.generic-space-header',
+  extensionType: 'customComponent'
+}
+
 export const fileSideBarFileDetailsTableExtensionPoint: ExtensionPoint<CustomComponentExtension> = {
   id: 'app.files.sidebar.file-details.table',
   extensionType: 'customComponent'
@@ -133,6 +138,7 @@ export const extensionPoints = () => {
       folderViewsSharedViaLinkExtensionPoint,
       folderViewsSharedWithOthersExtensionPoint,
       folderViewsSearchExtensionPoint,
+      genericSpaceHeaderExtensionPoint,
       floatingActionButtonExtension,
       fileSideBarFileDetailsTableExtensionPoint,
       fileSideBarSharesPanelSharedWithTopExtensionPoint,
diff --git a/packages/web-app-files/src/views/spaces/GenericSpace.vue b/packages/web-app-files/src/views/spaces/GenericSpace.vue
index f82ee83a3c..7470676e2c 100644
--- a/packages/web-app-files/src/views/spaces/GenericSpace.vue
+++ b/packages/web-app-files/src/views/spaces/GenericSpace.vue
@@ -31,7 +31,23 @@
           :class="{ 'h-[40vh]': isSpaceFrontpage }"
         />
         <template v-else>
-          <space-header v-if="isSpaceFrontpage" :space="space" class="px-4" />
+          <custom-component-target
+            v-if="hasGenericSpaceHeaderExtension"
+            :extension-point="genericSpaceHeaderExtensionPoint"
+          >
+            <template #fallback>
+              <space-header
+                v-if="isSpaceFrontpage"
+                :space="space"
+                class="px-4"
+              />
+            </template>
+          </custom-component-target>
+          <space-header
+            v-else-if="isSpaceFrontpage"
+            :space="space"
+            class="px-4"
+          />
           <no-content-message
             v-if="isCurrentFolderEmpty"
             id="files-space-empty"
@@ -107,7 +123,7 @@
 <script setup lang="ts">
 import { omit, last } from 'lodash-es'
 import { basename } from 'path'
-import { computed, onBeforeUnmount, onMounted, unref, watch } from 'vue'
+import { computed, onBeforeUnmount, onMounted, ref, unref, watch } from 'vue'
 import { useGettext } from 'vue3-gettext'
 import { Resource } from '@opencloud-eu/web-client'
 import {
@@ -146,8 +162,10 @@ import {
   useKeyboardActions,
   useRoute,
   useRouteQuery,
-  FolderLoaderOptions
+  FolderLoaderOptions,
+  CustomComponentTarget
 } from '@opencloud-eu/web-pkg'
+import { genericSpaceHeaderExtensionPoint } from '../../extensionPoints'
 import CreateAndUpload from '../../components/AppBar/CreateAndUpload.vue'
 import FilesViewWrapper from '../../components/FilesViewWrapper.vue'
 import ListInfo from '../../components/FilesList/ListInfo.vue'
@@ -200,6 +218,10 @@ const canUpload = computed(() => {
 })
 
 const folderNotFound = computed(() => unref(currentFolder) === null)
+
+const hasGenericSpaceHeaderExtension = computed(() => {
+  return extensionRegistry.requestExtensions(genericSpaceHeaderExtensionPoint).length > 0
+})
 const isCurrentFolderEmpty = computed(() => unref(paginatedResources).length < 1)
 
 const titleSegments = computed(() => {
diff --git a/packages/web-pkg/src/components/CustomComponentTarget.vue b/packages/web-pkg/src/components/CustomComponentTarget.vue
index 712eb2aee3..e6dd4c7c8f 100644
--- a/packages/web-pkg/src/components/CustomComponentTarget.vue
+++ b/packages/web-pkg/src/components/CustomComponentTarget.vue
@@ -1,14 +1,17 @@
 <template>
-  <component
-    :is="extension.content"
-    v-for="extension in extensions"
-    :key="`custom-component-${extension.id}`"
-    v-bind="extension.componentProps ? extension.componentProps() : undefined"
-  />
+  <template v-for="extension in extensions" :key="`custom-component-${extension.id}`">
+    <component
+      :is="extension.content"
+      v-bind="extension.componentProps ? extension.componentProps() : undefined"
+      @vue:mounted="onChildMounted"
+      @vue:unmounted="onChildUnmounted"
+    />
+  </template>
+  <slot v-if="!hasRenderedContent" name="fallback" />
 </template>
 
 <script setup lang="ts">
-import { computed, unref } from 'vue'
+import { computed, ref, unref } from 'vue'
 import {
   CustomComponentExtension,
   ExtensionPoint,
@@ -23,6 +26,24 @@ const props = defineProps<{
 const extensionRegistry = useExtensionRegistry()
 const extensionPreferences = useExtensionPreferencesStore()
 
+// Track whether any extension component actually rendered visible content
+const mountedCount = ref(0)
+const hasRenderedContent = computed(() => mountedCount.value > 0)
+
+function onChildMounted(e: any) {
+  // Check if the component rendered something visible (not just a comment node)
+  const el = e?.el
+  if (el && el.nodeType !== 8 /* Comment */) {
+    mountedCount.value++
+  }
+}
+
+function onChildUnmounted() {
+  if (mountedCount.value > 0) mountedCount.value--
+}
+
+defineExpose({ hasRenderedContent })
+
 const allExtensions = computed(() => {
   return extensionRegistry.requestExtensions(props.extensionPoint)
 })