From 18a5fc1fbf60666dc2509872efee5e8fa6ff750f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20St=C5=99=C3=ADbn=C3=BD?= <petr@stribny.name>
Date: Wed, 15 Apr 2026 16:53:38 +0200
Subject: [PATCH] fix: custom enterprise logo can be set again (#5201)

* Custom enterprise logo can be set again

* Address feedback
---
 .../unreleased/bug/fix_enterprise_logo.json    |  9 +++++++++
 .../components/EnterpriseLogo.vue              |  3 ++-
 web-frontend/modules/core/components/Logo.vue  | 18 ++++++++++--------
 3 files changed, 21 insertions(+), 9 deletions(-)
 create mode 100644 changelog/entries/unreleased/bug/fix_enterprise_logo.json

diff --git a/changelog/entries/unreleased/bug/fix_enterprise_logo.json b/changelog/entries/unreleased/bug/fix_enterprise_logo.json
new file mode 100644
index 0000000000..3cd15890ee
--- /dev/null
+++ b/changelog/entries/unreleased/bug/fix_enterprise_logo.json
@@ -0,0 +1,9 @@
+{
+    "type": "bug",
+    "message": "Custom enterprise logo can be set again",
+    "issue_origin": "github",
+    "issue_number": null,
+    "domain": "core",
+    "bullet_points": [],
+    "created_at": "2026-04-15"
+}
diff --git a/enterprise/web-frontend/modules/baserow_enterprise/components/EnterpriseLogo.vue b/enterprise/web-frontend/modules/baserow_enterprise/components/EnterpriseLogo.vue
index 53ccd5971f..78328190b6 100644
--- a/enterprise/web-frontend/modules/baserow_enterprise/components/EnterpriseLogo.vue
+++ b/enterprise/web-frontend/modules/baserow_enterprise/components/EnterpriseLogo.vue
@@ -7,6 +7,8 @@
 </template>
 
 <script>
+import baserowLogo from '@baserow/modules/core/static/img/logo.svg?url'
+
 export default {
   name: 'EnterpriseLogo',
   methods: {
@@ -15,7 +17,6 @@ export default {
       return !!settings.co_branding_logo
     },
     getLogoUrl(parent) {
-      const baserowLogo = require('@baserow/modules/core/static/img/logo.svg?url')
       const settings = this.$store.getters['settings/get']
       if (settings.co_branding_logo) {
         return settings.co_branding_logo.url
diff --git a/web-frontend/modules/core/components/Logo.vue b/web-frontend/modules/core/components/Logo.vue
index 8992a6ead1..639478834b 100644
--- a/web-frontend/modules/core/components/Logo.vue
+++ b/web-frontend/modules/core/components/Logo.vue
@@ -1,13 +1,15 @@
 <template>
-  <!-- TODO MIG component :is="getComponent()" v-if="getComponent()" /-->
   <!-- must be in sync with modules/baserow_enterprise/components/EnterpriseLogo.vue -->
-  <div class="logo">
-    <img
-      src="@baserow/modules/core/static/img/logo.svg?url"
-      v-bind="$attrs"
-      :class="[$attrs.class]"
-    />
-  </div>
+  <component :is="getComponent()" v-if="getComponent()"></component>
+  <template v-else>
+    <div class="logo">
+      <img
+        src="@baserow/modules/core/static/img/logo.svg?url"
+        v-bind="$attrs"
+        :class="[$attrs.class]"
+      />
+    </div>
+  </template>
 </template>
 
 <script>