diff --git a/app/controllers/concerns/checkout_callbacks.rb b/app/controllers/concerns/checkout_callbacks.rb
index ae9c2fb357..bb620715a0 100644
--- a/app/controllers/concerns/checkout_callbacks.rb
+++ b/app/controllers/concerns/checkout_callbacks.rb
@@ -42,7 +42,8 @@ module CheckoutCallbacks
   end
 
   def load_saved_credit_cards
-    @saved_credit_cards = spree_current_user ? spree_current_user.credit_cards.with_payment_profile.all : []
+    @saved_credit_cards = [] if !spree_current_user
+    @saved_credit_cards = spree_current_user.credit_cards.with_payment_profile.all if spree_current_user
     @selected_card = nil
   end