diff --git a/Library/Homebrew/cask/lib/hbc/cli/search.rb b/Library/Homebrew/cask/lib/hbc/cli/search.rb
index d56d0c81fe..d7fac8cd72 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/search.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/search.rb
@@ -30,6 +30,7 @@ module Hbc
           opoo "Error searching on GitHub: #{error}\n"
           []
         end
+
         matches.map do |match|
           tap = Tap.fetch(match["repository"]["full_name"])
           next if tap.installed?
@@ -65,7 +66,7 @@ module Hbc
           return
         end
 
-        if !exact_match && partial_matches.empty?
+        if !exact_match && partial_matches.empty? && remote_matches.empty?
           puts "No Cask found for \"#{search_term}\"."
           return
         end