diff --git a/lib/algora/bounties/schemas/prize_pool.ex b/lib/algora/bounties/schemas/prize_pool.ex
index a00b61aef..cbf1c00c9 100644
--- a/lib/algora/bounties/schemas/prize_pool.ex
+++ b/lib/algora/bounties/schemas/prize_pool.ex
@@ -5,6 +5,7 @@ defmodule Algora.Bounties.PrizePool do
   import Ecto.Query
 
   alias Algora.Bounties.Bounty
+  alias Algora.Payments.Transaction
   alias Algora.Repo
   alias Algora.Workspace.Ticket
 
@@ -29,7 +30,8 @@ defmodule Algora.Bounties.PrizePool do
 
   @type criterion ::
           {:limit, non_neg_integer()}
-          | {:owner_id, integer()}
+          | {:viewer_id, String.t()}
+          | {:owner_id, String.t()}
           | {:status, :open | :paid}
           | {:tech_stack, [String.t()]}
 
@@ -59,6 +61,7 @@ defmodule Algora.Bounties.PrizePool do
         id: r.id,
         name: r.name,
         owner: %{
+          id: ro.id,
           login: ro.provider_login
         }
       },
@@ -119,6 +122,14 @@ defmodule Algora.Bounties.PrizePool do
       {:status, status}, query ->
         from([b] in query, where: b.status == ^status)
 
+      {:viewer_id, viewer_id}, query ->
+        from b in query,
+          join: t_credit in Transaction,
+          on: t_credit.user_id == ^viewer_id and t_credit.type == :credit and t_credit.status == :succeeded,
+          join: t_debit in Transaction,
+          on: t_debit.id == t_credit.linked_transaction_id and t_debit.type == :debit and t_debit.status == :succeeded,
+          where: b.owner_id == t_debit.user_id
+
       _, query ->
         query
     end)
diff --git a/test/algora/bounties_test.exs b/test/algora/bounties_test.exs
index 8dca086ba..a754abc30 100644
--- a/test/algora/bounties_test.exs
+++ b/test/algora/bounties_test.exs
@@ -108,39 +108,6 @@ defmodule Algora.BountiesTest do
       assert_enqueued(worker: SendEmail, args: %{"activity_id" => bounty.id})
     end
 
-    test "query" do
-      {:ok, bounty} =
-        Enum.reduce(1..10, nil, fn _n, _acc ->
-          creator = insert!(:user)
-          owner = insert!(:user)
-          _installation = insert!(:installation, owner: creator)
-          _identity = insert!(:identity, user: creator, provider_email: creator.email)
-          repo = insert!(:repository, %{user: owner})
-          ticket = insert!(:ticket, %{repository: repo})
-          amount = ~M[100]usd
-
-          bounty_params =
-            %{
-              ticket_ref: %{owner: owner.handle, repo: repo.name, number: ticket.number},
-              owner: owner,
-              creator: creator,
-              amount: amount
-            }
-
-          Bounties.create_bounty(bounty_params, [])
-        end)
-
-      assert Bounties.list_bounties(
-               owner_id: bounty.owner_id,
-               tech_stack: ["elixir"],
-               status: :open
-             )
-
-      # assert Bounties.fetch_stats(bounty.owner_id)
-      # assert Bounties.fetch_stats()
-      assert Bounties.PrizePool.list()
-    end
-
     test "successfully creates and pays invoice for bounty claim" do
       creator = insert!(:user)
       owner = insert!(:organization)
@@ -279,6 +246,59 @@ defmodule Algora.BountiesTest do
     end
   end
 
+  describe "PrizePool.list/1" do
+    test "solver only sees bounties from orgs they received payments from" do
+      solver = insert!(:user)
+      org_with_history = insert!(:user)
+      org_without_history = insert!(:user)
+
+      credit_id = Nanoid.generate()
+      debit_id = Nanoid.generate()
+
+      insert!(:transaction, %{
+        id: credit_id,
+        type: :credit,
+        user_id: solver.id,
+        net_amount: ~M[100]usd,
+        status: :succeeded,
+        linked_transaction_id: debit_id
+      })
+
+      insert!(:transaction, %{
+        id: debit_id,
+        type: :debit,
+        user_id: org_with_history.id,
+        net_amount: ~M[100]usd,
+        status: :succeeded,
+        linked_transaction_id: credit_id
+      })
+
+      for org <- [org_with_history, org_without_history] do
+        for _ <- 1..5 do
+          creator = insert!(:user)
+          repo = insert!(:repository, user: org)
+          _installation = insert!(:installation, owner: creator, connected_user: org)
+          _identity = insert!(:identity, user: creator, provider_email: creator.email)
+          ticket = insert!(:ticket, repository: repo)
+
+          bounty_params = %{
+            ticket_ref: %{owner: org.provider_login, repo: repo.name, number: ticket.number},
+            owner: org,
+            creator: creator,
+            amount: ~M[100]usd
+          }
+
+          Bounties.create_bounty(bounty_params, [])
+        end
+      end
+
+      result = Bounties.PrizePool.list(viewer_id: solver.id)
+
+      assert length(result) == 5
+      assert Enum.all?(result, fn pool -> pool.repository.owner.id == org_with_history.id end)
+    end
+  end
+
   describe "get_response_body/4" do
     test "generates correct response body with bounties and attempts" do
       repo_owner = insert!(:user, provider_login: "repo_owner")