diff --git a/deploy/lib/upgrader.rb b/deploy/lib/upgrader.rb
index e7236a94..2ac56451 100644
--- a/deploy/lib/upgrader.rb
+++ b/deploy/lib/upgrader.rb
@@ -23,6 +23,7 @@ class Upgrader
     def initialize(options)
       @logger = options[:logger]
       @app_type = options[:properties]["ml.app-type"]
+      @server_version = options[:properties]["ml.server-version"].to_i
       @no_prompt = options[:no_prompt]
     end
 
@@ -57,6 +58,10 @@ def upgrade(args)
         fork = find_arg(['--fork']) || 'marklogic'
         branch = find_arg(['--branch']) || 'master'
 
+        if @server_version < 7 && branch != "v1.7.0"
+          raise ExitException.new("Upgrades to branch #{branch} no longer supported for MarkLogic #{@server_version}, use 'v1.7.0' instead")
+        end
+
         print "This command will attempt to upgrade to the latest Roxy files.\n"
         print "Before running this command, you should have checked all your code\n"
         print "into a source code repository, such as Git or Subversion. Doing so\n"