diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
index 4958ad802c..7cf58db1cf 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs
@@ -216,7 +216,7 @@ public abstract class AppTemplateBase : TemplateInfo
 
         RemoveThemeLogoFolders(context, steps);
 
-        if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value))
+        if (IsDefaultThemeForTemplate(context.BuildArgs))
         {
             return;
         }
@@ -238,15 +238,17 @@ public abstract class AppTemplateBase : TemplateInfo
         }
     }
 
-    private static bool IsDefaultThemeForTemplate(Theme theme)
+    private static bool IsDefaultThemeForTemplate(ProjectBuildArgs args)
     {
-        var defaultThemesForTemplates = new[]
+        var templateThemes = new Dictionary<string, Theme> 
         {
-            AppTemplate.DefaultTheme, AppProTemplate.DefaultTheme,
-            AppNoLayersTemplate.DefaultTheme, AppNoLayersProTemplate.DefaultTheme
+            { AppTemplate.TemplateName, AppTemplate.DefaultTheme },
+            { AppProTemplate.TemplateName, AppProTemplate.DefaultTheme },
+            { AppNoLayersTemplate.TemplateName, AppNoLayersTemplate.DefaultTheme },
+            { AppNoLayersProTemplate.TemplateName, AppNoLayersProTemplate.DefaultTheme }
         };
 
-        return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme);
+        return templateThemes.TryGetValue(args.TemplateName!, out var templateTheme) && templateTheme == args.Theme;
     }
 
     private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, bool isProTemplate, UiFramework uiFramework)