diff --git a/app/controllers/split_checkout_controller.rb b/app/controllers/split_checkout_controller.rb
index bedaa6ab2a..344ca96a36 100644
--- a/app/controllers/split_checkout_controller.rb
+++ b/app/controllers/split_checkout_controller.rb
@@ -18,7 +18,9 @@ class SplitCheckoutController < ::BaseController
   def edit
     return redirect_to_step unless params[:step]
 
-    return redirect_to_guest if !@order.distributor.allow_guest_orders? && params[:step] != "guest"
+    return redirect_to_guest if !spree_current_user &&
+                                !@order.distributor.allow_guest_orders? &&
+                                params[:step] != "guest"
   end
 
   def update