diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3201c9b73..c14b2e941 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
-## master
+## 2.2.0 (unreleased)
+
+- Remove `wildcard_redirect_url` option
 
 
 ## 2.1.0
@@ -22,10 +24,12 @@
   Disables implicit and password grant flows by default.
 - [#510, #544, 722113f] Revoked refresh token response bugfix.
 
+
 ## 2.0.1
 
 - [#525, #526, #527] Fix `ActiveRecord::NoDatabaseError` on gem load.
 
+
 ## 2.0.0
 
 ### Backward incompatible changes
diff --git a/lib/doorkeeper/config.rb b/lib/doorkeeper/config.rb
index 37c4c8f38..40b38f956 100644
--- a/lib/doorkeeper/config.rb
+++ b/lib/doorkeeper/config.rb
@@ -191,7 +191,6 @@ def extended(base)
     option :native_redirect_uri,           default: 'urn:ietf:wg:oauth:2.0:oob'
     option :active_record_options,         default: {}
     option :realm,                         default: 'Doorkeeper'
-    option :wildcard_redirect_uri,         default: false
     option :force_ssl_in_redirect_uri,     default: !Rails.env.development?
     option :grant_flows,                   default: %w(authorization_code client_credentials)
 
diff --git a/lib/doorkeeper/oauth/helpers/uri_checker.rb b/lib/doorkeeper/oauth/helpers/uri_checker.rb
index ef5a3a70a..6be87c01f 100644
--- a/lib/doorkeeper/oauth/helpers/uri_checker.rb
+++ b/lib/doorkeeper/oauth/helpers/uri_checker.rb
@@ -11,13 +11,8 @@ def self.valid?(url)
 
         def self.matches?(url, client_url)
           url, client_url = as_uri(url), as_uri(client_url)
-          if Doorkeeper.configuration.wildcard_redirect_uri
-            return true if url.to_s =~ /^#{Regexp.escape(client_url.to_s)}/
-            false
-          else
-            url.query = nil
-            url == client_url
-          end
+          url.query = nil
+          url == client_url
         end
 
         def self.valid_for_authorization?(url, client_url)
diff --git a/lib/generators/doorkeeper/templates/initializer.rb b/lib/generators/doorkeeper/templates/initializer.rb
index 98b6b4cc4..45b1e6f9f 100644
--- a/lib/generators/doorkeeper/templates/initializer.rb
+++ b/lib/generators/doorkeeper/templates/initializer.rb
@@ -97,9 +97,4 @@
 
   # WWW-Authenticate Realm (default "Doorkeeper").
   # realm "Doorkeeper"
-
-  # Allow dynamic query parameters (disabled by default)
-  # Some applications require dynamic query parameters on their request_uri
-  # set to true if you want this to be allowed
-  # wildcard_redirect_uri false
 end
diff --git a/spec/dummy/config/initializers/doorkeeper.rb b/spec/dummy/config/initializers/doorkeeper.rb
index b35985448..fd3fef049 100644
--- a/spec/dummy/config/initializers/doorkeeper.rb
+++ b/spec/dummy/config/initializers/doorkeeper.rb
@@ -95,9 +95,4 @@
 
   # WWW-Authenticate Realm (default "Doorkeeper").
   realm "Doorkeeper"
-
-  # Allow dynamic query parameters (disabled by default)
-  # Some applications require dynamic query parameters on their request_uri
-  # set to true if you want this to be allowed
-  # wildcard_redirect_uri false
 end
diff --git a/spec/lib/config_spec.rb b/spec/lib/config_spec.rb
index dbf4083c2..1e88d75df 100644
--- a/spec/lib/config_spec.rb
+++ b/spec/lib/config_spec.rb
@@ -199,12 +199,6 @@
     end
   end
 
-  describe 'wildcard_redirect_uri' do
-    it 'is disabled by default' do
-      Doorkeeper.configuration.wildcard_redirect_uri.should be_falsey
-    end
-  end
-
   describe 'realm' do
     it 'is \'Doorkeeper\' by default' do
       expect(Doorkeeper.configuration.realm).to eq('Doorkeeper')
diff --git a/spec/lib/oauth/helpers/uri_checker_spec.rb b/spec/lib/oauth/helpers/uri_checker_spec.rb
index fcb90f683..50b4c072d 100644
--- a/spec/lib/oauth/helpers/uri_checker_spec.rb
+++ b/spec/lib/oauth/helpers/uri_checker_spec.rb
@@ -53,28 +53,16 @@ module Doorkeeper::OAuth::Helpers
         expect(URIChecker.matches?(uri, client_uri)).to be_truthy
       end
 
-      context 'allows wildcard redirect_uri' do
-        before do
-          Doorkeeper.configuration.stub(wildcard_redirect_uri: true)
-        end
-
-        it 'ignores query parameter on comparison' do
-          uri = 'http://app.co/?query=hello'
-          client_uri = 'http://app.co'
-          expect(URIChecker.matches?(uri, client_uri)).to be true
-        end
-
-        it 'doesn\'t allow non-matching domains through' do
-          uri = 'http://app.abc/?query=hello'
-          client_uri = 'http://app.co'
-          expect(URIChecker.matches?(uri, client_uri)).to be false
-        end
-
-        it 'doesn\'t allow non-matching domains that don\'t start at the beginning' do
-          uri = 'http://app.co/?query=hello'
-          client_uri = 'http://example.com?app.co=test'
-          expect(URIChecker.matches?(uri, client_uri)).to be false
-        end
+      it 'doesn\'t allow non-matching domains through' do
+        uri = 'http://app.abc/?query=hello'
+        client_uri = 'http://app.co'
+        expect(URIChecker.matches?(uri, client_uri)).to be_falsey
+      end
+
+      it 'doesn\'t allow non-matching domains that don\'t start at the beginning' do
+        uri = 'http://app.co/?query=hello'
+        client_uri = 'http://example.com?app.co=test'
+        expect(URIChecker.matches?(uri, client_uri)).to be_falsey
       end
     end
 
@@ -111,17 +99,6 @@ module Doorkeeper::OAuth::Helpers
         uri = client_uri = 'http://app.co/aaa?waffles=abc'
         expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be false
       end
-
-      context 'allows wildcard redirect_uri' do
-        before do
-          Doorkeeper.configuration.stub(wildcard_redirect_uri: true)
-        end
-
-        it 'is true if valid, matches and contains a query parameter' do
-          uri = client_uri = 'http://app.co/aaa?waffles=abc'
-          expect(URIChecker.valid_for_authorization?(uri, client_uri)).to be true
-        end
-      end
     end
   end
 end