diff --git a/packages/api/src/controllers/config.js b/packages/api/src/controllers/config.js
index 161af17d4..699f48a87 100644
--- a/packages/api/src/controllers/config.js
+++ b/packages/api/src/controllers/config.js
@@ -65,6 +65,7 @@ module.exports = {
       isElectron: platformInfo.isElectron,
       isLicenseValid,
       isLicenseExpired: checkedLicense?.isExpired,
+      trialDaysLeft: checkedLicense?.isGeneratedTrial && !checkedLicense?.isExpired ? checkedLicense?.daysLeft : null,
       checkedLicense,
       configurationError,
       logoutUrl: await authProvider.getLogoutUrl(),
diff --git a/packages/web/src/EnterLicensePage.svelte b/packages/web/src/EnterLicensePage.svelte
index 8469304db..03e1e0f86 100644
--- a/packages/web/src/EnterLicensePage.svelte
+++ b/packages/web/src/EnterLicensePage.svelte
@@ -18,6 +18,7 @@
   const values = writable({ amoid: null, databaseServer: null });
 
   $: isExpired = $config?.isLicenseExpired;
+  $: trialDaysLeft = $config?.trialDaysLeft;
 
   let errorMessage = '';
   let expiredMessageSet = false;
@@ -48,6 +49,7 @@
           <FormSubmit
             value="Save license"
             on:click={async e => {
+              sessionStorage.setItem('continueTrialConfirmed', '1');
               const { licenseKey } = e.detail;
               const resp = await apiCall('config/save-license-key', { licenseKey });
               if (resp?.status == 'ok') {
@@ -59,7 +61,7 @@
           />
         </div>
 
-        {#if !isExpired}
+        {#if !isExpired && trialDaysLeft == null}
           <div class="submit">
             <FormStyledButton
               value="Start 30-day trial"
@@ -67,6 +69,7 @@
                 errorMessage = '';
                 const license = await apiCall('config/start-trial');
                 if (license?.status == 'ok') {
+                  sessionStorage.setItem('continueTrialConfirmed', '1');
                   internalRedirectTo('/index.html');
                 } else {
                   errorMessage = license?.errorMessage || 'Error starting trial';
@@ -76,6 +79,18 @@
           </div>
         {/if}
 
+        {#if trialDaysLeft > 0}
+          <div class="submit">
+            <FormStyledButton
+              value={`Continue trial (${trialDaysLeft} days left)`}
+              on:click={async e => {
+                sessionStorage.setItem('continueTrialConfirmed', '1');
+                internalRedirectTo('/index.html');
+              }}
+            />
+          </div>
+        {/if}
+
         <div class="submit">
           <FormStyledButton
             value="Purchase DbGate Premium"
diff --git a/packages/web/src/clientAuth.ts b/packages/web/src/clientAuth.ts
index fc702b43f..86dee2b1f 100644
--- a/packages/web/src/clientAuth.ts
+++ b/packages/web/src/clientAuth.ts
@@ -131,6 +131,10 @@ export async function handleAuthOnStartup(config, isAdminPage = false) {
     }
   }
 
+  if (config.trialDaysLeft != null && config.trialDaysLeft <= 14 && !sessionStorage.getItem('continueTrialConfirmed')) {
+    internalRedirectTo(`/license.html`);
+  }
+
   if (getAuthCategory(config) == 'admin') {
     if (localStorage.getItem('adminAccessToken')) {
       return;
@@ -165,7 +169,7 @@ export async function redirectToLogin(config = null, force = false) {
 
   if (getAuthCategory(config) == 'token') {
     if (!force) {
-      const page = window['dbgate_page']
+      const page = window['dbgate_page'];
       if (page == 'login' || page == 'admin-login' || page == 'not-logged') {
         return;
       }