diff --git a/src/blackgui/components/settingsxswiftbuscomponent.cpp b/src/blackgui/components/settingsxswiftbuscomponent.cpp
index 57c2b19b5..bb0f59d1a 100644
--- a/src/blackgui/components/settingsxswiftbuscomponent.cpp
+++ b/src/blackgui/components/settingsxswiftbuscomponent.cpp
@@ -34,10 +34,10 @@ namespace BlackGui
         {
             ui->setupUi(this);
 
-            connect(ui->pb_Save, &QPushButton::released, this, &CSettingsXSwiftBusComponent::saveServer);
+            connect(ui->pb_Save,  &QPushButton::released, this, &CSettingsXSwiftBusComponent::saveServer);
             connect(ui->pb_Reset, &QPushButton::released, this, &CSettingsXSwiftBusComponent::resetServer);
 
-            const QString dBusAddress = m_xSwiftBusServerSetting.get();
+            const QString dBusAddress = m_xSwiftBusSettings.get().getDBusServerAddressQt();
             ui->comp_DBusServer->setForXSwiftBus();
             ui->comp_DBusServer->set(dBusAddress);
         }
@@ -47,7 +47,7 @@ namespace BlackGui
 
         void CSettingsXSwiftBusComponent::resetServer()
         {
-            const QString s = TXSwiftBusServer::defaultValue();
+            const QString s = TXSwiftBusSettings::defaultValue().getDBusServerAddressQt();
             ui->comp_DBusServer->set(s);
         }
 
@@ -55,9 +55,12 @@ namespace BlackGui
         {
             const QString dBusAddress = ui->comp_DBusServer->getDBusAddress();
             if (dBusAddress.isEmpty()) { return; }
-            if (dBusAddress != m_xSwiftBusServerSetting.getThreadLocal())
+            CXSwiftBusSettings s = m_xSwiftBusSettings.getThreadLocal();
+
+            if (dBusAddress != s.getDBusServerAddressQt())
             {
-                const CStatusMessage msg = m_xSwiftBusServerSetting.setAndSave(dBusAddress);
+                s.setDBusServerAddressQt(dBusAddress);
+                const CStatusMessage msg = m_xSwiftBusSettings.setAndSave(dBusAddress);
                 CXSwiftBusConfigWriter xswiftbusConfigWriter;
                 xswiftbusConfigWriter.setDBusAddress(dBusAddress);
                 xswiftbusConfigWriter.updateInAllXPlaneVersions();
diff --git a/src/blackgui/components/settingsxswiftbuscomponent.h b/src/blackgui/components/settingsxswiftbuscomponent.h
index 50523c1d0..33b4d7f20 100644
--- a/src/blackgui/components/settingsxswiftbuscomponent.h
+++ b/src/blackgui/components/settingsxswiftbuscomponent.h
@@ -38,11 +38,11 @@ namespace BlackGui
             explicit CSettingsXSwiftBusComponent(QWidget *parent = nullptr);
 
             //! Dtor
-            virtual ~CSettingsXSwiftBusComponent();
+            virtual ~CSettingsXSwiftBusComponent() override;
 
         private:
             QScopedPointer<Ui::CSettingsXSwiftBusComponent> ui;
-            BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusServer> m_xSwiftBusServerSetting { this };
+            BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusSettings { this };
 
             void resetServer();
             void saveServer();