diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85796fda9..180b77372 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@
 * Fixed bug where on invalid input only the last syntax error is displayed
   (instead of all of them) ([#2117](https://github.com/pry/pry/pull/2117))
 
+#### API changes
+
+* `Pry::Config` returns `nil` on undefined option instead of raising
+  `NoMethodError` (usually invoked via `Pry.config.foo_option` calls)
+  ([#2126](https://github.com/pry/pry/pull/2126))
+
 ### [v0.13.0][v0.13.0] (March 21, 2020)
 
 #### Features
diff --git a/lib/pry/config.rb b/lib/pry/config.rb
index 6c377a484..0e54bf695 100644
--- a/lib/pry/config.rb
+++ b/lib/pry/config.rb
@@ -239,17 +239,17 @@ def [](attr)
       @custom_attrs[attr.to_s].call
     end
 
-    def method_missing(method_name, *args, &block)
+    # rubocop:disable Style/MethodMissingSuper
+    def method_missing(method_name, *args, &_block)
       name = method_name.to_s
 
       if name.end_with?('=')
         self[name[0..-2]] = args.first
       elsif @custom_attrs.key?(name)
         self[name]
-      else
-        super
       end
     end
+    # rubocop:enable Style/MethodMissingSuper
 
     def respond_to_missing?(method_name, include_all = false)
       @custom_attrs.key?(method_name.to_s.tr('=', '')) || super
diff --git a/spec/config_spec.rb b/spec/config_spec.rb
index db91f7cbe..f1cf5ea6c 100644
--- a/spec/config_spec.rb
+++ b/spec/config_spec.rb
@@ -150,8 +150,8 @@
     end
 
     context "when invoked method is not an option" do
-      it "raises NoMethodError" do
-        expect { subject.foo }.to raise_error(NoMethodError)
+      it "returns nil" do
+        expect(subject.foo).to be_nil
       end
     end