diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 13ee39ccd7..8c56e17a13 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -70,12 +70,17 @@ export default class AdvancedRoomSettingsTab extends React.Component {
                 <div>
                     <p className='mx_SettingsTab_warningText'>
                         {_t(
-                            "Members of the room will be required to click a link to join the new room. No " +
-                            "one will be automatically joined or invited to the new room.",
+                            "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members " +
+                            "to the new version of the room.</i> We'll post a link to the new room in the old version " +
+                                "of the room - room members will have to click this link to join the new room.",
+                            {}, {
+                                "b": (sub) => <b>{sub}</b>,
+                                "i": (sub) => <i>{sub}</i>,
+                            },
                         )}
                     </p>
                     <AccessibleButton onClick={this._upgradeRoom} kind='primary'>
-                        {_t("Upgrade room to version %(ver)s", {ver: this.state.upgradeRecommendation.version})}
+                        {_t("Upgrade this room to the recommended room version")}
                     </AccessibleButton>
                 </div>
             );
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index d450e92d71..a49fc485fe 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -586,7 +586,8 @@
     "Camera": "Camera",
     "Voice & Video": "Voice & Video",
     "This room is not accessible by remote Matrix servers": "This room is not accessible by remote Matrix servers",
-    "Upgrade room to version %(ver)s": "Upgrade room to version %(ver)s",
+    "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.": "<b>Warning</b>: Upgrading a room will <i>not automatically migrate room members to the new version of the room.</i> We'll post a link to the new room in the old version of the room - room members will have to click this link to join the new room.",
+    "Upgrade this room to the recommended room version": "Upgrade this room to the recommended room version",
     "Room information": "Room information",
     "Internal room ID:": "Internal room ID:",
     "Room version": "Room version",