vaadin
diff --git a/‎flow-plugins/flow-plugin-base/src/main/java/com/vaadin/flow/plugin/base/BuildFrontendUtil.java
Lines changed: 5 additions & 4 deletions b/‎flow-plugins/flow-plugin-base/src/main/java/com/vaadin/flow/plugin/base/BuildFrontendUtil.java
Lines changed: 5 additions & 4 deletions
diff --git a/‎flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java
Lines changed: 30 additions & 0 deletions b/‎flow-plugins/flow-plugin-base/src/test/java/com/vaadin/flow/plugin/base/BuildFrontendUtilTest.java
Lines changed: 30 additions & 0 deletions
@@ -907,22 +907,23 @@ public static void updateBuildFile(PluginAdapterBuild adapter,
             buildInfo.put(SERVLET_PARAMETER_PRODUCTION_MODE, true);
             buildInfo.put(APPLICATION_IDENTIFIER,
                     adapter.applicationIdentifier());
+            boolean applyCommercialBanner = needsCommercialBanner
+                    && adapter.isCommercialBannerEnabled();
             if (licenseRequired) {
                 if (LocalSubscriptionKey.get() != null) {
                     adapter.logInfo("Daily Active User tracking enabled");
                     buildInfo.put(Constants.DAU_TOKEN, true);
                     checkLicenseCheckerAtRuntime(adapter);
                 }
-                if (needsCommercialBanner
-                        && adapter.isCommercialBannerEnabled()) {
+                if (applyCommercialBanner) {
                     adapter.logInfo("Application commercial banner enabled");
                     buildInfo.put(Constants.COMMERCIAL_BANNER_TOKEN, true);
                 }
             }
             if (isControlCenterAvailable(adapter.getClassFinder())
-                    && LicenseChecker.isValidLicense(
+                    && (applyCommercialBanner || LicenseChecker.isValidLicense(
                             "vaadin-commercial-cc-client", null,
-                            BuildType.PRODUCTION)) {
+                            BuildType.PRODUCTION))) {
                 adapter.logInfo("Premium Features are enabled");
                 buildInfo.put(Constants.PREMIUM_FEATURES, true);
             }
 
@@ -458,6 +458,36 @@ public void updateBuildFile_tokenExisting_licenseRequiredAndIsNotPremiumLike_pre
         });
     }
 
+    @Test
+    public void updateBuildFile_tokenExisting_commercialBannerBuildRequiredAndIsPremiumLike_premiumFeaturesFlagAdded()
+            throws Exception {
+        Mockito.when(adapter.isCommercialBannerEnabled()).thenReturn(true);
+        File tokenFile = prepareAndAssertTokenFile();
+
+        addPremiumFeatureAndDAUFlagTrue(tokenFile);
+
+        ClassLoader classLoader = new URLClassLoader(
+                new URL[] { new File(baseDir, "target/test-classes/").toURI()
+                        .toURL() },
+                BuildFrontendUtilTest.class.getClassLoader());
+        ClassFinder classFinder = new ClassFinder.DefaultClassFinder(
+                classLoader);
+        Mockito.when(adapter.getClassFinder()).thenReturn(classFinder);
+
+        withMockedLicenseChecker(false, () -> {
+            BuildFrontendUtil.updateBuildFile(adapter, true, true);
+            Assert.assertTrue("Token file should still exist",
+                    tokenFile.exists());
+            JsonNode buildInfoJsonProd = JacksonUtils
+                    .readTree(Files.readString(tokenFile.toPath()));
+            Assert.assertTrue(
+                    Constants.PREMIUM_FEATURES
+                            + " flag should be active in token file",
+                    buildInfoJsonProd.get(Constants.PREMIUM_FEATURES)
+                            .booleanValue());
+        });
+    }
+
     @Test
     public void updateBuildFile_tokenExisting_commercialBannerBuildRequired_commercialBannerBuildEnabled_commercialBannerFlagAdded()
             throws Exception {