diff --git a/lib/dunlop/ember/api_base_controller.rb b/lib/dunlop/ember/api_base_controller.rb
index 0a7c83e..398548a 100644
--- a/lib/dunlop/ember/api_base_controller.rb
+++ b/lib/dunlop/ember/api_base_controller.rb
@@ -10,6 +10,10 @@ module Dunlop::Ember::ApiBaseController
     rescue_from CanCan::AccessDenied do
       render json: {errors: [{status: 403, detail: 'unauthorized'}]}, status: 403
     end
+
+    rescue_from ActiveRecord::RecordNotFound do
+      render json: {data: nil}, status: 404
+    end
   end
 
   def index