diff --git a/lib/open_food_network/available_payment_method_filter.rb b/lib/open_food_network/available_payment_method_filter.rb
index 379beb22b5..2e9af09bf8 100644
--- a/lib/open_food_network/available_payment_method_filter.rb
+++ b/lib/open_food_network/available_payment_method_filter.rb
@@ -15,9 +15,9 @@ module OpenFoodNetwork
     end
 
     def stripe_configuration_incomplete?(payment_method)
-      return true if payment_method.preferred_enterprise_id.zero?
-
-      payment_method.stripe_account_id.blank?
+      payment_method.preferred_enterprise_id.nil? ||
+        payment_method.preferred_enterprise_id.zero? ||
+        payment_method.stripe_account_id.blank?
     end
   end
 end