diff --git a/apps/login/src/lib/api.ts b/apps/login/src/lib/api.ts
index e5caa7de66..31301fdc77 100644
--- a/apps/login/src/lib/api.ts
+++ b/apps/login/src/lib/api.ts
@@ -9,7 +9,15 @@ export async function getInstanceUrl(host: string): Promise<string> {
     return process.env.ZITADEL_API_URL || "";
   }
 
-  const instance = await getInstanceByHost(host);
+  const instance = await getInstanceByHost(host).catch((error) => {
+    console.error(`Could not get instance by host ${host}`, error);
+    return null;
+  });
+
+  if (!instance) {
+    throw new Error("No instance found");
+  }
+
   const generatedDomain = instance.domains.find(
     (domain) => domain.generated === true,
   );
diff --git a/apps/login/src/middleware.ts b/apps/login/src/middleware.ts
index 701ec93c9c..04bc0e2b02 100644
--- a/apps/login/src/middleware.ts
+++ b/apps/login/src/middleware.ts
@@ -32,7 +32,7 @@ export async function middleware(request: NextRequest) {
     instanceUrl = await getInstanceUrl(host);
   } catch (error) {
     console.error(
-      "Could not get instance url, fallback to ZITADEL_API_URL",
+      `[Middleware]: Could not get instance url of ${host}, fallback to ZITADEL_API_URL ${process.env.ZITADEL_API_URL}`,
       error,
     );
     instanceUrl = process.env.ZITADEL_API_URL;