diff --git a/lib/suma/apps.rb b/lib/suma/apps.rb
index f28a5777..09c4b5b5 100644
--- a/lib/suma/apps.rb
+++ b/lib/suma/apps.rb
@@ -161,8 +161,7 @@ class AdminAPI < Suma::Service
   end
 
   UrlRedirects = Rack::Builder.new do
-    shortener = Suma::UrlShortener.new_shortener
-    run ::UrlShortener::RackApp.new(shortener)
+    run ::UrlShortener::RackApp.new(Suma::UrlShortener.shortener)
   end
 
   def self.emplace_dynamic_config
diff --git a/lib/suma/url_shortener.rb b/lib/suma/url_shortener.rb
index 0a6f93fc..6eafc604 100644
--- a/lib/suma/url_shortener.rb
+++ b/lib/suma/url_shortener.rb
@@ -36,7 +36,6 @@ def enabled? = !self.disabled
 
     # @return [UrlShortener]
     def shortener
-      return nil unless self.enabled?
       return @shortener ||= new_shortener
     end
 
diff --git a/spec/suma/url_shortener_spec.rb b/spec/suma/url_shortener_spec.rb
index aaf32451..b5da7add 100644
--- a/spec/suma/url_shortener_spec.rb
+++ b/spec/suma/url_shortener_spec.rb
@@ -3,10 +3,9 @@
 require "suma/url_shortener"
 
 RSpec.describe Suma::UrlShortener do
-  it "returns nil for the shortener if disabled", reset_configuration: Suma::UrlShortener do
+  it "returns the shortener (even if disabled)", reset_configuration: Suma::UrlShortener do
     described_class.disabled = true
-    expect(described_class.shortener).to be_nil
-    described_class.disabled = false
+    expect(described_class).to_not be_enabled
     expect(described_class.shortener).to be_a(UrlShortener)
   end
 end