         (both-transfer? tx1 tx2)   (update-confirmations tx1 tx2)
         :else tx2))
 
+(defn own-transaction? [address [_ {:keys [type to from]}]]
+  (let [normalized (ethereum/normalized-address address)]
+    (or (and (= :inbound type) (= normalized (ethereum/normalized-address to)))
+        (and (= :outbound type) (= normalized (ethereum/normalized-address from)))
+        (and (= :failed type) (= normalized (ethereum/normalized-address from))))))
+
 (handlers/register-handler-db
  :update-transactions-success
- (fn [db [_ transactions]]
-   (-> db
-       (update-in [:wallet :transactions] #(merge-with dedupe-transactions % transactions))
-       (assoc-in [:wallet :transactions-loading?] false))))
+ (fn [db [_ transactions address]]
+   ;; NOTE(goranjovic): we want to only show transactions that belong to the current account
+   ;; this filter is to prevent any late transaction updates initated from another account on the same
+   ;; device from being applied in the current account.
+   (let [own-transactions (into {} (filter #(own-transaction? address %) transactions))]
+     (-> db
+         (update-in [:wallet :transactions] #(merge-with dedupe-transactions % own-transactions))
+         (assoc-in [:wallet :transactions-loading?] false)))))
 
 (handlers/register-handler-db
  :update-transactions-fail

                                   token-addresses
                                   direction
                                   account-id
                                   #(re-frame/dispatch [success-event %])))))

;; TODO(oskarth): At some point we want to get list of relevant assets to get prices for
(reg-fx

 (fn [{:keys [web3 chain account-id token-addresses success-event error-event]}]
   (transactions/get-transactions chain
                                  account-id
                                  #(re-frame/dispatch [success-event % account-id])
                                  #(re-frame/dispatch [error-event %]))
   (doseq [direction [:inbound :outbound]]
     (erc20/get-token-transactions web3
