diff --git a/packages/medusa/src/repositories/money-amount.ts b/packages/medusa/src/repositories/money-amount.ts
index 63713651b7..496562a962 100644
--- a/packages/medusa/src/repositories/money-amount.ts
+++ b/packages/medusa/src/repositories/money-amount.ts
@@ -126,21 +126,17 @@ export class MoneyAmountRepository extends Repository<MoneyAmount> {
     const date = new Date()
 
     const qb = this.createQueryBuilder("ma")
-      .leftJoinAndSelect(
-        "ma.price_list",
-        "price_list",
-        "ma.price_list_id = price_list.id "
-      )
+      .leftJoinAndSelect("ma.price_list", "price_list")
       .where({ variant_id: variant_id })
       .andWhere("(ma.price_list_id is null or price_list.status = 'active')")
       .andWhere(
-        "(price_list is null or price_list.ends_at is null OR price_list.ends_at > :date) ",
+        "(price_list.ends_at is null OR price_list.ends_at > :date)",
         {
           date: date.toUTCString(),
         }
       )
       .andWhere(
-        "(price_list is null or price_list.starts_at is null OR price_list.starts_at < :date)",
+        "(price_list.starts_at is null OR price_list.starts_at < :date)",
         {
           date: date.toUTCString(),
         }
@@ -155,23 +151,19 @@ export class MoneyAmountRepository extends Repository<MoneyAmount> {
         )
       )
     } else if (!customer_id && !include_discount_prices) {
-      qb.andWhere("price_list IS null")
+      qb.andWhere("price_list.id IS null")
     }
 
     if (customer_id) {
       qb.leftJoin("price_list.customer_groups", "cgroup")
-        .leftJoin(
-          "customer_group_customers",
-          "cgc",
-          "cgc.customer_group_id = cgroup.id"
-        )
-        .andWhere("(cgc is null OR cgc.customer_id = :customer_id)", {
+        .leftJoin("customer_group_customers", "cgc", "cgc.customer_group_id = cgroup.id")
+        .andWhere("(cgc.customer_group_id is null OR cgc.customer_id = :customer_id)", {
           customer_id,
         })
     } else {
-      qb.leftJoin("price_list.customer_groups", "cgroup").andWhere(
-        "cgroup.id is null"
-      )
+      qb
+        .leftJoin("price_list.customer_groups", "cgroup")
+        .andWhere("cgroup.id is null")
     }
     return await qb.getManyAndCount()
   }