diff --git a/src/exchange/FixedRateExchange.ts b/src/exchange/FixedRateExchange.ts
index f7db94af..ceab6efc 100644
--- a/src/exchange/FixedRateExchange.ts
+++ b/src/exchange/FixedRateExchange.ts
@@ -377,10 +377,8 @@ export class OceanFixedRateExchange {
       toBlock: 'latest'
     })
     for (let i = 0; i < events.length; i++) {
-      if (account) {
-        if (events[i].returnValues[3] === account)
-          result.push(await this.getExchange(events[i].returnValues[0]))
-      } else result.push(await this.getExchange(events[i].returnValues[0]))
+      if (!account || events[i].returnValues[3] === account)
+        result.push(await this.getExchange(events[i].returnValues[0]))
     }
     return result
   }
@@ -402,10 +400,8 @@ export class OceanFixedRateExchange {
       toBlock: 'latest'
     })
     for (let i = 0; i < events.length; i++) {
-      if (account) {
-        if (events[i].returnValues[1] === account)
-          result.push(this.getEventData(events[i]))
-      } else result.push(this.getEventData(events[i]))
+      if (!account || events[i].returnValues[1] === account)
+        result.push(this.getEventData(events[i]))
     }
     return result
   }