diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs
index 46a59f82e..64ea26bf5 100644
--- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs
+++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs
@@ -33,8 +33,8 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
         public Task HandleAsync(CommandContext context, Func<Task> next)
         {
             if (context.IsCompleted &&
-                context.Command is CreateApp createApp &&
-                string.Equals(createApp.Template, TemplateName, StringComparison.OrdinalIgnoreCase))
+                context.Command is global::Squidex.Domain.Apps.Entities.Apps.Commands.CreateApp createApp &&
+                IsRightTemplate(createApp))
             {
                 var appId = new NamedId<Guid>(createApp.AppId, createApp.Name);
 
@@ -54,6 +54,11 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates
             return TaskHelper.Done;
         }
 
+        private static bool IsRightTemplate(CreateApp createApp)
+        {
+            return string.Equals(createApp.Template, TemplateName, StringComparison.OrdinalIgnoreCase);
+        }
+
         private static async Task CreateClientAsync(Func<AppCommand, Task> publishAsync, NamedId<Guid> appId)
         {
             await publishAsync(new AttachClient { Id = "sample-client" });
diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html
index 68f4e00ec..9c65780f2 100644
--- a/src/Squidex/app/features/apps/pages/apps-page.component.html
+++ b/src/Squidex/app/features/apps/pages/apps-page.component.html
@@ -25,7 +25,7 @@
 </div>
 
 <div class="apps-section">
-    <div class="card card-template card-href" (click)="createNewApp(null)">
+    <div class="card card-template card-href" (click)="createNewApp('')">
         <div class="card-body">
             <div class="card-image">
                 <img src="/images/add-app.png" />