diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
new file mode 100644
index 0000000000..9fef52fc8c
--- /dev/null
+++ b/config/initializers/devise.rb
@@ -0,0 +1,5 @@
+Devise.setup do |config|
+  # Add a default scope to devise, to prevent it from checking
+  # whether other devise enabled models are signed into a session or not
+  config.default_scope = :spree_user
+end
\ No newline at end of file