diff --git a/CHANGES.md b/CHANGES.md
index 9fac7874bb..2d9af087db 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@
 
 - Fix VCS/migration/assistant scopes [#6071](https://github.com/appwrite/appwrite/pull/6071)
 - Add missing parameters required for custom email templates [#6077](https://github.com/appwrite/appwrite/pull/6077)
+- Fix `Call to a member function label() on null` error when using a custom domain [#6079](https://github.com/appwrite/appwrite/pull/6079)
 
 ## Changes
 
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 2552a3e10c..e3b47098b2 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -47,7 +47,7 @@ Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
 function router(App $utopia, Database $dbForConsole, SwooleRequest $swooleRequest, Request $request, Response $response)
 {
-    $utopia->getRoute()->label('error', __DIR__ . '/../views/general/error.phtml');
+    $utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
 
     $host = $request->getHostname() ?? '';