diff --git a/app/services/order_available_payment_methods.rb b/app/services/order_available_payment_methods.rb
index 0e89825723..c3f71cc1da 100644
--- a/app/services/order_available_payment_methods.rb
+++ b/app/services/order_available_payment_methods.rb
@@ -30,8 +30,14 @@ class OrderAvailablePaymentMethods
       distributor.payment_methods
     else
       distributor.payment_methods.where(
-        id: order_cycle.distributor_payment_methods.select(:payment_method_id)
+        id: available_distributor_payment_methods_ids
       )
     end.available.select(&:configured?)
   end
+
+  def available_distributor_payment_methods_ids
+    order_cycle.distributor_payment_methods
+      .where(distributor_id: distributor.id)
+      .select(:payment_method_id)
+  end
 end
diff --git a/spec/services/order_available_payment_methods_spec.rb b/spec/services/order_available_payment_methods_spec.rb
index a8e4fedb45..8f3983b826 100644
--- a/spec/services/order_available_payment_methods_spec.rb
+++ b/spec/services/order_available_payment_methods_spec.rb
@@ -214,4 +214,28 @@ describe OrderAvailablePaymentMethods do
       end
     end
   end
+
+  context "when two distributors implement the same payment methods" do
+    context "only one distributor supports the two payment methods in the order cycle" do
+      let(:oc){ create(:order_cycle) }
+      let(:payment_method){ create(:payment_method) }
+      let(:payment_method2){ create(:payment_method) }
+      let(:d1){ oc.distributors.first }
+      let(:d2){ oc.distributors.second }
+      before {
+        d1.payment_methods << payment_method
+        d1.payment_methods << payment_method2
+        d2.payment_methods << payment_method
+        d2.payment_methods << payment_method2
+        oc.selected_distributor_payment_methods << d1.distributor_payment_methods.first
+        oc.selected_distributor_payment_methods << d1.distributor_payment_methods.second
+        oc.selected_distributor_payment_methods << d2.distributor_payment_methods.first
+      }
+      it do
+        order = build(:order, distributor: d2, order_cycle: oc)
+        order_available_payment_methods = OrderAvailablePaymentMethods.new(order).to_a
+        expect(order_available_payment_methods).to eq([d2.payment_methods.first])
+      end
+    end
+  end
 end