diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index 253829c0e..405d10cdc 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -44,6 +44,7 @@ module.exports = {
       isDocker: platformInfo.isDocker,
       isElectron: platformInfo.isElectron,
       isLicenseValid: platformInfo.isLicenseValid,
+      licenseError: platformInfo.licenseError,
       permissions,
       login,
       ...additionalConfigProps,
diff --git a/packages/api/src/utility/checkLicense.js b/packages/api/src/utility/checkLicense.js
index 3a91fbaf5..78e37202c 100644
--- a/packages/api/src/utility/checkLicense.js
+++ b/packages/api/src/utility/checkLicense.js
@@ -1,5 +1,5 @@
 function checkLicense() {
-  return true;
+  return null;
 }
 
 module.exports = {
diff --git a/packages/api/src/utility/platformInfo.js b/packages/api/src/utility/platformInfo.js
index 41e051823..f11cbf86d 100644
--- a/packages/api/src/utility/platformInfo.js
+++ b/packages/api/src/utility/platformInfo.js
@@ -13,7 +13,8 @@ const isDocker = fs.existsSync('/home/dbgate-docker/public');
 const isDevMode = process.env.DEVMODE == '1';
 const isNpmDist = !!global['IS_NPM_DIST'];
 const isForkedApi = processArgs.isForkedApi;
-const isLicenseValid = checkLicense();
+const licenseError = checkLicense();
+const isLicenseValid = licenseError == null;
 
 // function moduleAvailable(name) {
 //   try {
@@ -33,6 +34,7 @@ const platformInfo = {
   isForkedApi,
   isElectron: isElectron(),
   isLicenseValid,
+  licenseError,
   isDevMode,
   isNpmDist,
   isSnap: process.env.ELECTRON_SNAP == 'true',
diff --git a/packages/web/src/ErrorPage.svelte b/packages/web/src/ErrorPage.svelte
index bc580c28a..e5e4b9d45 100644
--- a/packages/web/src/ErrorPage.svelte
+++ b/packages/web/src/ErrorPage.svelte
@@ -21,10 +21,12 @@
     <div class="box">
       <div class="heading">Configuration error</div>
       {#if !$config?.isLicenseValid}
-        <ErrorInfo message="Invalid license, please set DBGATE_LICENSE environment variable" />
+        <ErrorInfo message={`Invalid license. Please contact sales@dbgate.eu for more details. ${$config?.licenseError}`} />
       {:else}
         <ErrorInfo message="No error found, try to open app again" />
-        <Link href="?">Back to app</Link>
+        <div class="m-2">
+          <Link href="?">Back to app</Link>
+        </div>
       {/if}
     </div>
   </div>
diff --git a/packages/web/src/clientAuth.ts b/packages/web/src/clientAuth.ts
index 9c2c22d8d..b471c517a 100644
--- a/packages/web/src/clientAuth.ts
+++ b/packages/web/src/clientAuth.ts
@@ -43,6 +43,7 @@ export function handleOauthCallback() {
 export async function handleAuthOnStartup(config, isAdminPage = false) {
   if (!config.isLicenseValid) {
     internalRedirectTo(`?page=error`);
+    return;
   }
 
   if (config.isAdminLoginForm && isAdminPage) {