diff --git a/src/main/java/sirius/biz/web/BizController.java b/src/main/java/sirius/biz/web/BizController.java
index 502b81f3c..ad721e8ef 100644
--- a/src/main/java/sirius/biz/web/BizController.java
+++ b/src/main/java/sirius/biz/web/BizController.java
@@ -141,6 +141,11 @@ protected String getBaseUrl() {
                 LOG.WARN("product.baseUrl is not filled. Please update the system configuration!");
             }
         }
+
+        if (UserContext.getSettings().getConfig().hasPath("tenant.baseUrl")) {
+            return UserContext.getSettings().get("tenant.baseUrl").asString();
+        }
+
         return baseUrl;
     }