diff --git a/lib/capistrano/configuration/connections.rb b/lib/capistrano/configuration/connections.rb
index bf05df5c..16ea020f 100644
--- a/lib/capistrano/configuration/connections.rb
+++ b/lib/capistrano/configuration/connections.rb
@@ -153,7 +153,7 @@ module Capistrano
           servers = find_servers_for_task(task, options)
 
           if servers.empty?
-            if ENV['HOSTFILTER'] || task.options.merge(options)[:on_no_matching_servers] == :continue
+            if ENV['HOSTFILTER'] || ENV['HOSTROLEFILTER'] || task.options.merge(options)[:on_no_matching_servers] == :continue
               logger.info "skipping `#{task.fully_qualified_name}' because no servers matched"
             else
               unless dry_run