diff --git a/nymea-app/ui/Configuration.qml b/nymea-app/ui/Configuration.qml
index 6142764d..3a0203fc 100644
--- a/nymea-app/ui/Configuration.qml
+++ b/nymea-app/ui/Configuration.qml
@@ -19,6 +19,7 @@ ConfigurationBase {
     modbusSettingsEnabled: true
     pluginSettingsEnabled: true
 
+    tunnelProxyUrl: "tunnelproxy.nymea.io"
 
     mainMenuLinks: [
         {
diff --git a/nymea-app/ui/ConfigurationBase.qml b/nymea-app/ui/ConfigurationBase.qml
index d09311ac..9f26e80e 100644
--- a/nymea-app/ui/ConfigurationBase.qml
+++ b/nymea-app/ui/ConfigurationBase.qml
@@ -9,6 +9,9 @@ Item {
 
     property string connectionWizard: ""
 
+    property string tunnelProxyUrl: ""
+    property int tunnelProxyPort: 2213
+
     // Enable/disable certain features
     property bool magicEnabled: false
     property bool networkSettingsEnabled: false
diff --git a/nymea-app/ui/connection/ManualConnectionEntry.qml b/nymea-app/ui/connection/ManualConnectionEntry.qml
index 43f2f05b..27283a5b 100644
--- a/nymea-app/ui/connection/ManualConnectionEntry.qml
+++ b/nymea-app/ui/connection/ManualConnectionEntry.qml
@@ -69,7 +69,7 @@ ColumnLayout {
             id: addressTextInput
             objectName: "addressTextInput"
             Layout.fillWidth: true
-            placeholderText: connectionTypeComboBox.currentIndex < 2 ? "127.0.0.1" : "tunnelproxy.nymea.io"
+            placeholderText: connectionTypeComboBox.currentIndex < 2 ? "127.0.0.1" : Configuration.tunnelProxyUrl
         }
 
         Label {
@@ -89,7 +89,7 @@ ColumnLayout {
                              ? "2222"
                              : connectionTypeComboBox.currentIndex == 1
                                ? "4444"
-                               : "2213"
+                               : Configuration.tunnelProxyPort
             validator: IntValidator{bottom: 1; top: 65535;}
         }
 
diff --git a/nymea-app/ui/system/AdvancedConnectionInterfacesPage.qml b/nymea-app/ui/system/AdvancedConnectionInterfacesPage.qml
index 77dc9005..a196421e 100644
--- a/nymea-app/ui/system/AdvancedConnectionInterfacesPage.qml
+++ b/nymea-app/ui/system/AdvancedConnectionInterfacesPage.qml
@@ -173,7 +173,7 @@ SettingsPageBase {
         text: qsTr("Add")
         visible: engine.jsonRpcClient.ensureServerVersion("6.0")
         onClicked: {
-            var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration("tunnelproxy.nymea.io", 2213, true, true, false);
+            var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration(Configuration.tunnelProxyUrl, Configuration.tunnelProxyPort, true, true, false);
             var component = Qt.createComponent(Qt.resolvedUrl("TunnelProxyServerConfigurationDialog.qml"));
             var popup = component.createObject(root, { serverConfiguration: config });
             popup.accepted.connect(function() {
diff --git a/nymea-app/ui/system/ConnectionInterfacesPage.qml b/nymea-app/ui/system/ConnectionInterfacesPage.qml
index 70e4e6e2..142b74df 100644
--- a/nymea-app/ui/system/ConnectionInterfacesPage.qml
+++ b/nymea-app/ui/system/ConnectionInterfacesPage.qml
@@ -60,7 +60,7 @@ SettingsPageBase {
                     engine.nymeaConfiguration.deleteTunnelProxyServerConfiguration(config.id)
                 }
             } else {
-                var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration("tunnelproxy.nymea.io", 2213, true, true, false);
+                var config = engine.nymeaConfiguration.createTunnelProxyServerConfiguration(Configuration.tunnelProxyUrl, Configuration.tunnelProxyPort, true, true, false);
                 engine.nymeaConfiguration.setTunnelProxyServerConfiguration(config)
             }
         }