diff --git a/app/controllers/concerns/saved_searches/check_availability.rb b/app/controllers/concerns/saved_searches/check_availability.rb
deleted file mode 100644
index 0a1690438..000000000
--- a/app/controllers/concerns/saved_searches/check_availability.rb
+++ /dev/null
@@ -1,25 +0,0 @@
-module SavedSearches
-  module CheckAvailability
-    extend ActiveSupport::Concern
-
-    included do
-      before_filter :check_availability
-    end
-
-    def check_availability
-      if !SavedSearch.enabled?
-        respond_to do |format|
-          format.html do
-            flash[:notice] = "Listbooru service is not configured. Saved searches are not available."
-            redirect_to :back
-          end
-          format.json do
-            render json: {success: false, reason: "Listbooru service is not configured"}.to_json, status: 501
-          end
-        end
-
-        return false
-      end
-    end
-  end
-end
diff --git a/app/controllers/saved_searches_controller.rb b/app/controllers/saved_searches_controller.rb
index 6e9cfc039..83d02d062 100644
--- a/app/controllers/saved_searches_controller.rb
+++ b/app/controllers/saved_searches_controller.rb
@@ -1,7 +1,6 @@
 class SavedSearchesController < ApplicationController
-  include SavedSearches::CheckAvailability
-
   before_filter :member_only
+  before_filter :check_availability
   respond_to :html, :xml, :json, :js
   
   def index
@@ -56,4 +55,10 @@ private
   def saved_searches
     CurrentUser.user.saved_searches
   end
+
+  def check_availability
+    if !SavedSearch.enabled?
+      raise NotImplementedError.new("Listbooru service is not configured. Saved searches are not available.")
+    end
+  end
 end