diff --git a/core/src/main/java/bisq/core/offer/OpenOfferManager.java b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
index 4021d8fe48..ae2d990dc8 100644
--- a/core/src/main/java/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/bisq/core/offer/OpenOfferManager.java
@@ -426,6 +426,7 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
             requestPersistence();
             resultHandler.handleResult(transaction);
         }, (errMessage) -> {
+            onRemoved(openOffer);
             errorMessageHandler.handleErrorMessage(errMessage);
         });
     }
@@ -478,12 +479,11 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
                                 ResultHandler resultHandler,
                                 ErrorMessageHandler errorMessageHandler) {
         if (!offersToBeEdited.containsKey(openOffer.getId())) {
-            Offer offer = openOffer.getOffer();
             if (openOffer.isDeactivated()) {
-                onRemoved(openOffer, resultHandler, offer);
+                onRemoved(openOffer);
             } else {
-                offerBookService.removeOffer(offer.getOfferPayload(),
-                        () -> onRemoved(openOffer, resultHandler, offer),
+                offerBookService.removeOffer(openOffer.getOffer().getOfferPayload(),
+                        () -> onRemoved(openOffer),
                         errorMessageHandler);
             }
         } else {
@@ -560,7 +560,8 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         }
     }
 
-    private void onRemoved(@NotNull OpenOffer openOffer, ResultHandler resultHandler, Offer offer) {
+    private void onRemoved(@NotNull OpenOffer openOffer) {
+        Offer offer = openOffer.getOffer();
         if (offer.getOfferPayload().getReserveTxKeyImages() != null) {
             for (String frozenKeyImage : offer.getOfferPayload().getReserveTxKeyImages()) xmrWalletService.getWallet().thawOutput(frozenKeyImage);
         }
@@ -571,7 +572,6 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe
         log.info("onRemoved offerId={}", offer.getId());
         btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
         requestPersistence();
-        resultHandler.handleResult();
     }
 
     // Close openOffer after deposit published
diff --git a/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java b/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java
index 9aabc17646..dba131b645 100644
--- a/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java
+++ b/desktop/src/main/java/bisq/desktop/main/shared/PriceFeedComboBoxItem.java
@@ -17,6 +17,7 @@
 
 package bisq.desktop.main.shared;
 
+import bisq.common.UserThread;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 
@@ -38,6 +39,6 @@ public class PriceFeedComboBoxItem {
     }
 
     public void setDisplayString(String displayString) {
-        this.displayStringProperty.set(displayString);
+        UserThread.execute(() ->  this.displayStringProperty.set(displayString));
     }
 }