diff --git a/config/services/database.yml b/config/services/database.yml
index b6549b64c..0cf1b7d4c 100644
--- a/config/services/database.yml
+++ b/config/services/database.yml
@@ -1,8 +1,4 @@
 services:
-  console.database_client:
-    class: Drupal\Console\Command\Database\ClientCommand
-    tags:
-      - { name: drupal.command }
   console.database_drop:
     class: Drupal\Console\Command\Database\DropCommand
     tags:
diff --git a/uninstall.services.yml b/uninstall.services.yml
index d26f88529..e551242fc 100644
--- a/uninstall.services.yml
+++ b/uninstall.services.yml
@@ -11,6 +11,10 @@ services:
     arguments: ['@app.root', '@console.configuration_manager']
     tags:
       - { name: drupal.command }
+  console.database_client:
+    class: Drupal\Console\Command\Database\ClientCommand
+    tags:
+      - { name: drupal.command }
   console.database_add:
     class: Drupal\Console\Command\Database\AddCommand
     arguments: ['@console.database_settings_generator']