diff --git a/Riot/Modules/Settings/SettingsViewController.m b/Riot/Modules/Settings/SettingsViewController.m
index 4c99850342..df4c0d0aac 100644
--- a/Riot/Modules/Settings/SettingsViewController.m
+++ b/Riot/Modules/Settings/SettingsViewController.m
@@ -344,7 +344,7 @@ - (void)updateSections
     Section *sectionUserSettings = [Section sectionWithTag:SECTION_TAG_USER_SETTINGS];
     [sectionUserSettings addRowWithTag:USER_SETTINGS_PROFILE_PICTURE_INDEX];
     [sectionUserSettings addRowWithTag:USER_SETTINGS_DISPLAYNAME_INDEX];
-    if (RiotSettings.shared.settingsScreenShowChangePassword)
+    if (RiotSettings.shared.settingsScreenShowChangePassword && self.mainSession.homeserverCapabilitiesService.canChangePassword)
     {
         [sectionUserSettings addRowWithTag:USER_SETTINGS_CHANGE_PASSWORD_INDEX];
     }
diff --git a/changelog.d/pr-7990.bugfix b/changelog.d/pr-7990.bugfix
new file mode 100644
index 0000000000..d6f7bf2547
--- /dev/null
+++ b/changelog.d/pr-7990.bugfix
@@ -0,0 +1 @@
+Respect the m.change_password capability in the Settings screen.
\ No newline at end of file