diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
index 7fd8bceb50..88735f99b2 100644
--- a/res/css/views/settings/tabs/_SettingsTab.scss
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+.mx_SettingsTab_warningText {
+    color: $warning-color;
+}
+
 .mx_SettingsTab_heading {
     font-size: 20px;
     font-weight: 600;
diff --git a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
index 3c6a7addc3..13ee39ccd7 100644
--- a/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
+++ b/src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.js
@@ -67,9 +67,17 @@ export default class AdvancedRoomSettingsTab extends React.Component {
         let roomUpgradeButton;
         if (this.state.upgradeRecommendation && this.state.upgradeRecommendation.needsUpgrade) {
             roomUpgradeButton = (
-                <AccessibleButton onClick={this._upgradeRoom} kind='primary'>
-                    {_t("Upgrade room to version %(ver)s", {ver: this.state.upgradeRecommendation.version})}
-                </AccessibleButton>
+                <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.",
+                        )}
+                    </p>
+                    <AccessibleButton onClick={this._upgradeRoom} kind='primary'>
+                        {_t("Upgrade room to version %(ver)s", {ver: this.state.upgradeRecommendation.version})}
+                    </AccessibleButton>
+                </div>
             );
         }