diff --git a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java
index 585291670b..f0ae9a531b 100644
--- a/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java
+++ b/core/src/main/java/bisq/core/api/CoreDisputeAgentsService.java
@@ -87,8 +87,7 @@ class CoreDisputeAgentsService {
         if (disputeAgentType.isPresent()) {
             ECKey ecKey;
             String signature;
-            DisputeAgentType validDisputeAgentType = disputeAgentType.get();
-            switch (validDisputeAgentType) {
+            switch ((disputeAgentType.get())) {
                 case ARBITRATOR:
                     throw new IllegalArgumentException("arbitrators must be registered in a Bisq UI");
                 case MEDIATOR:
@@ -100,6 +99,7 @@ class CoreDisputeAgentsService {
                     ecKey = refundAgentManager.getRegistrationKey(registrationKey);
                     signature = refundAgentManager.signStorageSignaturePubKey(Objects.requireNonNull(ecKey));
                     registerRefundAgent(nodeAddress, languageCodes, ecKey, signature);
+                    return;
             }
         } else {
             throw new IllegalArgumentException("unknown dispute agent type " + disputeAgentTypeString);