diff --git a/CHANGELOG.md b/CHANGELOG.md
index c43bc004..bfa34612 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,9 @@ https://github.com/capistrano/capistrano/compare/v3.4.0...HEAD
 
 * Removed the post-install message (@Kriechi)
 
+* Minor changes
+  * Fix filtering behaviour when using literal hostnames in on() block (@townsen)
+
 ## `3.4.0`
 
 https://github.com/capistrano/capistrano/compare/v3.3.5...v3.4.0
diff --git a/lib/capistrano/configuration.rb b/lib/capistrano/configuration.rb
index e025869f..2224456e 100644
--- a/lib/capistrano/configuration.rb
+++ b/lib/capistrano/configuration.rb
@@ -99,7 +99,7 @@ module Capistrano
       @filters = cmdline_filters.clone
       @filters << Filter.new(:role, ENV['ROLES']) if ENV['ROLES']
       @filters << Filter.new(:host, ENV['HOSTS']) if ENV['HOSTS']
-      fh = fetch_for(:filter,{})
+      fh = fetch_for(:filter,{}) || {}
       @filters << Filter.new(:host, fh[:host]) if fh[:host]
       @filters << Filter.new(:role, fh[:role]) if fh[:role]
     end
diff --git a/lib/capistrano/configuration/filter.rb b/lib/capistrano/configuration/filter.rb
index 2e22a193..5eb32324 100644
--- a/lib/capistrano/configuration/filter.rb
+++ b/lib/capistrano/configuration/filter.rb
@@ -46,9 +46,9 @@ module Capistrano
         when :none then return []
         when :all  then return servers
         when :host
-          as.select {|s| @rex.match s.hostname}
+          as.select {|s| @rex.match s.to_s}
         when :role
-          as.select {|s| s.roles.any? {|r| @rex.match r} }
+          as.select { |s| s.is_a?(String) ? false : s.roles.any? {|r| @rex.match r} }
         end
       end
     end
diff --git a/spec/integration/dsl_spec.rb b/spec/integration/dsl_spec.rb
index 49653a3d..cc4bb03a 100644
--- a/spec/integration/dsl_spec.rb
+++ b/spec/integration/dsl_spec.rb
@@ -467,56 +467,88 @@ describe Capistrano::DSL do
 
   describe 'on()' do
 
-    before do
-      dsl.server 'example1.com', roles: %w{web}, active: true
-      dsl.server 'example2.com', roles: %w{web}
-      dsl.server 'example3.com', roles: %w{app web}, active: true
-      dsl.server 'example4.com', roles: %w{app}, primary: true
-      dsl.server 'example5.com', roles: %w{db}, no_release: true
-      @coordinator = mock('coordinator')
-      @coordinator.expects(:each).returns(nil)
-      ENV.delete 'ROLES'
-      ENV.delete 'HOSTS'
+    describe "when passed server objects" do
+
+      before do
+        dsl.server 'example1.com', roles: %w{web}, active: true
+        dsl.server 'example2.com', roles: %w{web}
+        dsl.server 'example3.com', roles: %w{app web}, active: true
+        dsl.server 'example4.com', roles: %w{app}, primary: true
+        dsl.server 'example5.com', roles: %w{db}, no_release: true
+        @coordinator = mock('coordinator')
+        @coordinator.expects(:each).returns(nil)
+        ENV.delete 'ROLES'
+        ENV.delete 'HOSTS'
+      end
+
+      it 'filters by role from the :filter variable' do
+        hosts = dsl.roles(:web)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        dsl.set :filter, { role: 'web' }
+        dsl.on(all)
+      end
+
+      it 'filters by host and role from the :filter variable' do
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.set :filter, { role: 'db', host: 'example3.com' }
+        dsl.on(all)
+      end
+
+      it 'filters from ENV[ROLES]' do
+        hosts = dsl.roles(:db)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        ENV['ROLES'] = 'db'
+        dsl.on(all)
+      end
+
+      it 'filters from ENV[HOSTS]' do
+        hosts = dsl.roles(:db)
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
+        ENV['HOSTS'] = 'example5.com'
+        dsl.on(all)
+      end
+
+      it 'filters by ENV[HOSTS] && ENV[ROLES]' do
+        all = dsl.roles(:all)
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        ENV['HOSTS'] = 'example5.com'
+        ENV['ROLES'] = 'web'
+        dsl.on(all)
+      end
 
     end
 
-    it 'filters by role from the :filter variable' do
-      hosts = dsl.roles(:web)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      dsl.set :filter, { role: 'web' }
-      dsl.on(all)
-    end
+    describe "when passed server literal names" do
 
-    it 'filters by host and role from the :filter variable' do
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
-      dsl.set :filter, { role: 'db', host: 'example3.com' }
-      dsl.on(all)
-    end
+      before do
+        ENV.delete 'ROLES'
+        ENV.delete 'HOSTS'
+        @coordinator = mock('coordinator')
+        @coordinator.expects(:each).returns(nil)
+      end
 
-    it 'filters from ENV[ROLES]' do
-      hosts = dsl.roles(:db)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      ENV['ROLES'] = 'db'
-      dsl.on(all)
-    end
+      it "selects nothing when a role filter is present" do
+        dsl.set :filter, { role: 'web' }
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on('my.server')
+      end
 
-    it 'filters from ENV[HOSTS]' do
-      hosts = dsl.roles(:db)
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with(hosts).returns(@coordinator)
-      ENV['HOSTS'] = 'example5.com'
-      dsl.on(all)
-    end
+      it "selects using the string when a host filter is present" do
+        dsl.set :filter, { host: 'server.local' }
+        SSHKit::Coordinator.expects(:new).with(['server.local']).returns(@coordinator)
+        dsl.on('server.local')
+      end
+
+      it "doesn't select when a host filter is present that doesn't match" do
+        dsl.set :filter, { host: 'ruby.local' }
+        SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
+        dsl.on('server.local')
+      end
 
-    it 'filters by ENV[HOSTS] && ENV[ROLES]' do
-      all = dsl.roles(:all)
-      SSHKit::Coordinator.expects(:new).with([]).returns(@coordinator)
-      ENV['HOSTS'] = 'example5.com'
-      ENV['ROLES'] = 'web'
-      dsl.on(all)
     end
 
   end