diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
index 95e15a8fee8..ea7063a3776 100644
--- a/core/src/main/resources/i18n/displayStrings.properties
+++ b/core/src/main/resources/i18n/displayStrings.properties
@@ -1827,7 +1827,7 @@ offerDetailsWindow.makersOnion=Maker's onion address
 
 qRCodeWindow.headline=QR-Code
 qRCodeWindow.msg=Please use that QR-Code for funding your Bisq wallet from your external wallet.
-qRCodeWindow.request="Payment request:\n{0}
+qRCodeWindow.request=Payment request:\n{0}
 
 selectDepositTxWindow.headline=Select deposit transaction for dispute
 selectDepositTxWindow.msg=The deposit transaction was not stored in the trade.\n\
diff --git a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java b/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
index f8fe5675eef..5bb6b64b743 100644
--- a/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
@@ -50,6 +50,7 @@
 import bisq.core.util.BSFormatter;
 
 import bisq.common.UserThread;
+import bisq.common.app.DevEnv;
 import bisq.common.util.Tuple3;
 
 import org.bitcoinj.core.Coin;
@@ -176,7 +177,8 @@ public void initialize() {
         initializeSeparator();
         initializeDisplayCurrencies();
         initializeDisplayOptions();
-        initializeDaoOptions();
+        if (DevEnv.isDaoActivated())
+            initializeDaoOptions();
     }
 
 
@@ -189,7 +191,8 @@ protected void activate() {
         activateGeneralOptions();
         activateDisplayCurrencies();
         activateDisplayPreferences();
-        activateDaoPreferences();
+        if (DevEnv.isDaoActivated())
+            activateDaoPreferences();
     }
 
     @Override
@@ -197,7 +200,8 @@ protected void deactivate() {
         deactivateGeneralOptions();
         deactivateDisplayCurrencies();
         deactivateDisplayPreferences();
-        deactivateDaoPreferences();
+        if (DevEnv.isDaoActivated())
+            deactivateDaoPreferences();
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////