diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6b06aaec739..3684d2103d1 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -66,7 +66,7 @@ class ApplicationController < ActionController::Base
   end
 
   rescue_from Discourse::NotFound do
-    if request.format.html?
+    if !request.format || request.format.html?
       # for now do a simple remap, we may look at cleaner ways of doing the render
       raise ActiveRecord::RecordNotFound
     else