diff --git a/Library/Homebrew/cask/installer.rb b/Library/Homebrew/cask/installer.rb
index c9d797bc9b..4025fadb30 100644
--- a/Library/Homebrew/cask/installer.rb
+++ b/Library/Homebrew/cask/installer.rb
@@ -792,10 +792,10 @@ on_request: true)
 
       if installed_caskfile&.exist?
         begin
-          @cask = CaskLoader.load(installed_caskfile)
+          @cask = CaskLoader.load_from_installed_caskfile(installed_caskfile)
           return
-        rescue CaskInvalidError
-          # could be caused by trying to load outdated caskfile
+        rescue CaskInvalidError, CaskUnavailableError
+          # could be caused by trying to load outdated or deleted caskfile
         end
       end
 
diff --git a/Library/Homebrew/cask/migrator.rb b/Library/Homebrew/cask/migrator.rb
index c27c76aba6..1b96488695 100644
--- a/Library/Homebrew/cask/migrator.rb
+++ b/Library/Homebrew/cask/migrator.rb
@@ -80,7 +80,6 @@ module Cask
       when ".json"
         json = JSON.parse(path.read)
         json["token"] = new_token
-        json["old_tokens"] = [old_token, *json["old_tokens"]].compact.uniq
         path.atomic_write json.to_json
       end
     end