diff --git a/lib/crowbar/client/app/upgrade.rb b/lib/crowbar/client/app/upgrade.rb
index 02f1358..16d100d 100644
--- a/lib/crowbar/client/app/upgrade.rb
+++ b/lib/crowbar/client/app/upgrade.rb
@@ -307,8 +307,7 @@ def repocheck(component)
           catch_errors(e)
         end
 
-        desc "database MODE",
-          "Initialize Crowbar database"
+        desc "database MODE", "Initialize Crowbar database"
 
         long_desc <<-LONGDESC
           `database MODE` will set up the Crowbar database and perform the necessary migrations
@@ -382,6 +381,8 @@ def database(mode)
           catch_errors(e)
         end
 
+        remove_command :database unless Config.defaults[:upgrade_versions] == "6-to-7"
+
         desc "mode UPGRADEMODE",
           "Set/Get the upgrade mode (normal|non_disruptive)"