diff --git a/src/Spectre.Console/Cli/Internal/Extensions/TypeRegistrarExtensions.cs b/src/Spectre.Console/Cli/Internal/Extensions/TypeRegistrarExtensions.cs
index 14f713d..4b73fb5 100644
--- a/src/Spectre.Console/Cli/Internal/Extensions/TypeRegistrarExtensions.cs
+++ b/src/Spectre.Console/Cli/Internal/Extensions/TypeRegistrarExtensions.cs
@@ -27,7 +27,6 @@ namespace Spectre.Console.Cli
 
                 if (command.CommandType != null)
                 {
-                    registrar?.Register(typeof(ICommand), command.CommandType);
                     registrar?.Register(command.CommandType, command.CommandType);
                 }
 
diff --git a/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
index a3c9168..2e7bf78 100644
--- a/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
+++ b/test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
@@ -382,10 +382,12 @@ namespace Spectre.Console.Tests.Unit.Cli
             });
 
             // Then
-            registrar.Registrations.ContainsKey(typeof(ICommand)).ShouldBeTrue();
-            registrar.Registrations[typeof(ICommand)].ShouldContain(typeof(GenericCommand<FooCommandSettings>));
-            registrar.Registrations[typeof(ICommand)].ShouldContain(typeof(DogCommand));
-            registrar.Registrations[typeof(ICommand)].ShouldContain(typeof(HorseCommand));
+            registrar.Registrations.ContainsKey(typeof(GenericCommand<FooCommandSettings>)).ShouldBeTrue();
+            registrar.Registrations.ContainsKey(typeof(DogCommand)).ShouldBeTrue();
+            registrar.Registrations.ContainsKey(typeof(HorseCommand)).ShouldBeTrue();
+            registrar.Registrations[typeof(GenericCommand<FooCommandSettings>)].ShouldContain(typeof(GenericCommand<FooCommandSettings>));
+            registrar.Registrations[typeof(DogCommand)].ShouldContain(typeof(DogCommand));
+            registrar.Registrations[typeof(HorseCommand)].ShouldContain(typeof(HorseCommand));
         }
 
         [Fact]
@@ -406,8 +408,8 @@ namespace Spectre.Console.Tests.Unit.Cli
             });
 
             // Then
-            registrar.Registrations.ContainsKey(typeof(ICommand)).ShouldBeTrue();
-            registrar.Registrations[typeof(ICommand)].ShouldContain(typeof(DogCommand));
+            registrar.Registrations.ContainsKey(typeof(DogCommand)).ShouldBeTrue();
+            registrar.Registrations[typeof(DogCommand)].ShouldContain(typeof(DogCommand));
         }
 
         [Fact]