diff --git a/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js b/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
index e632ee131d1..a340a401938 100644
--- a/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
+++ b/flow-server/src/main/resources/plugins/application-theme-plugin/theme-generator.js
@@ -105,7 +105,7 @@ function generateThemeFile(themeFolder, themeName, themeProperties, productionMo
   let themeFile = headerImport;
 
   if (componentsFiles.length > 0) {
-    themeFile += 'import { css, unsafeCSS, registerStyles } from \'@vaadin/vaadin-themable-mixin/register-styles\';\n';
+    themeFile += 'import { unsafeCSS, registerStyles } from \'@vaadin/vaadin-themable-mixin/register-styles\';\n';
   }
 
   if (themeProperties.parent) {
@@ -205,9 +205,7 @@ function generateThemeFile(themeFolder, themeName, themeProperties, productionMo
 // Don't format as the generated file formatting will get wonky!
     const componentString = `registerStyles(
       '${tag}',
-      css\`
-        \${unsafeCSS(${variable}.toString())}
-      \`
+      unsafeCSS(${variable}.toString())
     );
     `;
     componentCssCode.push(componentString);