diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
index 21f2cc2ee5..6697aa33ea 100644
--- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
+++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java
@@ -251,6 +251,8 @@ public class PendingTradesPM extends PresentationModel<PendingTradesModel> {
         log.trace("tradeState " + tradeState);
         if (tradeState != null) {
             switch (tradeState) {
+                // TODO Check why OFFERER_ACCEPTED can happen, refactor state handling
+                case OFFERER_ACCEPTED:
                 case DEPOSIT_PUBLISHED:
                     state.set(model.isOfferer() ? State.OFFERER_BUYER_WAIT_TX_CONF : State.TAKER_SELLER_WAIT_TX_CONF);
                     break;
diff --git a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
index 8451c30edf..4ae02a6aeb 100644
--- a/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
+++ b/src/main/java/io/bitsquare/gui/main/trade/takeoffer/TakeOfferModel.java
@@ -161,6 +161,7 @@ class TakeOfferModel extends UIModel {
         trade.stateProperty().addListener((ov, oldValue, newValue) -> {
             log.debug("trade state = " + newValue);
             switch (newValue) {
+                // TODO Check why DEPOSIT_CONFIRMED can happen, refactor state handling
                 case DEPOSIT_PUBLISHED:
                 case DEPOSIT_CONFIRMED:
                     transactionId.set(trade.getDepositTx().getHashAsString());