diff --git a/app/controllers/dunlop/user_filters_controller.rb b/app/controllers/dunlop/user_filters_controller.rb
index f18addc..8405dc6 100644
--- a/app/controllers/dunlop/user_filters_controller.rb
+++ b/app/controllers/dunlop/user_filters_controller.rb
@@ -1,5 +1,7 @@
 class Dunlop::UserFiltersController < Dunlop::ApplicationController
-  include Dunlop::Ember::ApiBaseController # Ugly to require a non dependency here, but for now only used in application explicitly including dunlop-ember
+  if defined? Dunlop::Ember
+    include Dunlop::Ember::ApiBaseController # Ugly to require a non dependency here, but for now only used in application explicitly including dunlop-ember
+  end
   skip_before_action :verify_authenticity_token
   before_action :check_current_user
 
diff --git a/db/migrate/20181114140017_create_dunlop_user_filters.rb b/db/migrate/20181114140017_create_dunlop_user_filters.rb
index 7a4ccbb..be2c3a0 100644
--- a/db/migrate/20181114140017_create_dunlop_user_filters.rb
+++ b/db/migrate/20181114140017_create_dunlop_user_filters.rb
@@ -1,4 +1,4 @@
-class CreateDunlopUserFilters < ActiveRecord::Migration[5.2]
+class CreateDunlopUserFilters < ActiveRecord::Migration[5.1]
   def change
     create_table :dunlop_user_filters do |t|
       t.belongs_to :user
diff --git a/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb b/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb
index eb3931d..38a6aba 100644
--- a/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb
+++ b/db/migrate/20181128144538_add_name_to_dunlop_user_filters.rb
@@ -1,4 +1,4 @@
-class AddNameToDunlopUserFilters < ActiveRecord::Migration[5.2]
+class AddNameToDunlopUserFilters < ActiveRecord::Migration[5.1]
   def change
     add_column :dunlop_user_filters, :name, :string
     add_index :dunlop_user_filters, :scope_key