diff --git a/app/src/actions/ConnectionManager.ts b/app/src/actions/ConnectionManager.ts
index 7c9fd95..063bcb1 100644
--- a/app/src/actions/ConnectionManager.ts
+++ b/app/src/actions/ConnectionManager.ts
@@ -166,16 +166,38 @@ export const deleteConnection = (connectionId: string) => (dispatch: Dispatch<an
 }
 
 async function ensureConnectionsHaveBeenInitialized() {
-  const connections = await persistentStorage.load(storedConnectionsIdentifier)
+  let connections = await persistentStorage.load(storedConnectionsIdentifier)
   const requiresInitialization = !connections
   if (requiresInitialization) {
     const migratedConnection = loadLegacyConnectionOptions()
     const defaultConnections = makeDefaultConnections()
-    persistentStorage.store(storedConnectionsIdentifier, {
+    connections = {
       ...migratedConnection,
       ...defaultConnections,
-    })
+    }
+    await persistentStorage.store(storedConnectionsIdentifier, connections)
 
     clearLegacyConnectionOptions()
   }
+
+  // Migrate connections, rewrite dictionary to "keep" it "ordered" (dictionaries do not have a guaranteed order)
+  const mayNeedMigrations = connections && connections['iot.eclipse.org']
+  if (connections && mayNeedMigrations) {
+    let newConnections = {}
+    for (const connection of Object.values(connections)) {
+      addMigratedConnection(newConnections, connection)
+    }
+
+    await persistentStorage.store(storedConnectionsIdentifier, newConnections)
+  }
+}
+
+function addMigratedConnection(newConnections: { [key: string]: ConnectionOptions }, connection: ConnectionOptions) {
+  // The host has been renamed, only change the host if it has not been changed
+  if (connection.id === 'iot.eclipse.org' && connection.host === 'iot.eclipse.org') {
+    connection.id = 'mqtt.eclipse.org'
+    connection.host = 'mqtt.eclipse.org'
+    connection.name = 'mqtt.eclipse.org'
+  }
+  newConnections[connection.id] = connection
 }
diff --git a/app/src/model/ConnectionOptions.ts b/app/src/model/ConnectionOptions.ts
index 2fa7f90..fe98ffe 100644
--- a/app/src/model/ConnectionOptions.ts
+++ b/app/src/model/ConnectionOptions.ts
@@ -65,11 +65,12 @@ export function createEmptyConnection(): ConnectionOptions {
 
 export function makeDefaultConnections() {
   return {
-    'iot.eclipse.org': {
+    // remember: there was also iot.eclipse.org once
+    'mqtt.eclipse.org': {
       ...createEmptyConnection(),
-      id: 'iot.eclipse.org',
-      name: 'iot.eclipse.org',
-      host: 'iot.eclipse.org',
+      id: 'mqtt.eclipse.org',
+      name: 'mqtt.eclipse.org',
+      host: 'mqtt.eclipse.org',
     },
     'test.mosquitto.org': {
       ...createEmptyConnection(),