diff --git a/Library/Homebrew/cmd/untap.rb b/Library/Homebrew/cmd/untap.rb
index e00d6ae9e7..33f56c4ba8 100644
--- a/Library/Homebrew/cmd/untap.rb
+++ b/Library/Homebrew/cmd/untap.rb
@@ -43,7 +43,7 @@ module Homebrew
         end
       end
 
-      tap.uninstall
+      tap.uninstall manual: true
     end
   end
 end
diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
index 739ecdaca7..da6a653fa1 100644
--- a/Library/Homebrew/tap.rb
+++ b/Library/Homebrew/tap.rb
@@ -363,7 +363,7 @@ class Tap
   end
 
   # Uninstall this {Tap}.
-  def uninstall
+  def uninstall(manual: false)
     require "descriptions"
     raise TapUnavailableError, name unless installed?
 
@@ -386,7 +386,7 @@ class Tap
     Commands.rebuild_commands_completion_list
     clear_cache
 
-    return unless official?
+    return if !manual || !official?
 
     untapped = self.class.untapped_official_taps
     return if untapped.include? name