diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index b0ef7042be994..1439cab00bb26 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -36,11 +36,11 @@ def content_mime_type
       def content_type
         if self.class.return_only_media_type_on_content_type
           ActiveSupport::Deprecation.warn(
-            "Rails 6.1 will return Content-Type header without modification." \
+            "Rails 7.0 will return Content-Type header without modification." \
             " If you want just the MIME type, please use `#media_type` instead."
           )
 
-          content_mime_type && content_mime_type.to_s
+          content_mime_type&.to_s
         else
           super
         end