diff --git a/CHANGES.md b/CHANGES.md
index 35f4a23804..67b430e79b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,6 +17,7 @@ Other changes:
 Bugfix 🐛:
  - Fix avatar image disappearing (#777)
  - Fix read marker banner when permalink
+ - Hide non working settings (#751)
 
 Translations 🗣:
  -
diff --git a/vector/src/main/res/values/strings_riotX.xml b/vector/src/main/res/values/strings_riotX.xml
index 8c8e36be16..d0019bfca5 100644
--- a/vector/src/main/res/values/strings_riotX.xml
+++ b/vector/src/main/res/values/strings_riotX.xml
@@ -9,5 +9,6 @@
     <string name="settings_show_devices_list">See all my devices</string>
     <string name="settings_developer_mode">Developer mode</string>
     <string name="settings_developer_mode_summary">The developer mode activates hidden features and may also make the application less stable. For developers only!</string>
+    <string name="settings_rageshake">Rageshake</string>
 
 </resources>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index d1ffe5bcf1..cd94da2d15 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -74,11 +74,12 @@
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_home_server"
-            tools:summary="@string/default_hs_server_url" />
+            tools:summary="https://homeserver.org" />
 
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:title="@string/settings_identity_server"
+            app:isPreferenceVisible="@bool/false_not_implemented"
             tools:summary="https://identity.server.url" />
 
         <im.vector.riotx.core.preference.VectorPreference
@@ -93,8 +94,7 @@
 
     <im.vector.riotx.core.preference.VectorPreferenceDivider />
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory
-        android:title="@string/action_sign_out">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/action_sign_out">
 
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_SIGN_OUT_KEY"
@@ -104,7 +104,8 @@
 
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_DEACTIVATE_ACCOUNT_CATEGORY_KEY"
-        android:title="@string/settings_deactivate_account_section">
+        android:title="@string/settings_deactivate_account_section"
+        app:isPreferenceVisible="@bool/false_not_implemented">
 
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_DEACTIVATE_ACCOUNT_KEY"
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index 96471cfebe..7d490d124b 100644
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -30,13 +30,15 @@
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
             android:summary="@string/settings_inline_url_preview_summary"
-            android:title="@string/settings_inline_url_preview" />
+            android:title="@string/settings_inline_url_preview"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SEND_TYPING_NOTIF_KEY"
             android:summary="@string/settings_send_typing_notifs_summary"
-            android:title="@string/settings_send_typing_notifs" />
+            android:title="@string/settings_send_typing_notifs"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="false"
@@ -46,38 +48,45 @@
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
-            android:title="@string/settings_always_show_timestamps" />
+            android:title="@string/settings_always_show_timestamps"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_12_24_TIMESTAMPS_KEY"
-            android:title="@string/settings_12_24_timestamps" />
+            android:title="@string/settings_12_24_timestamps"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_READ_RECEIPTS_KEY"
             android:summary="@string/settings_show_read_receipts_summary"
-            android:title="@string/settings_show_read_receipts" />
+            android:title="@string/settings_show_read_receipts"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_JOIN_LEAVE_MESSAGES_KEY"
             android:summary="@string/settings_show_join_leave_messages_summary"
-            android:title="@string/settings_show_join_leave_messages" />
+            android:title="@string/settings_show_join_leave_messages"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
             android:key="SETTINGS_SHOW_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
             android:summary="@string/settings_show_avatar_display_name_changes_messages_summary"
-            android:title="@string/settings_show_avatar_display_name_changes_messages" />
+            android:title="@string/settings_show_avatar_display_name_changes_messages"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"
-            android:title="@string/settings_vibrate_on_mention" />
+            android:title="@string/settings_vibrate_on_mention"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_SEND_MESSAGE_WITH_ENTER"
             android:summary="@string/settings_send_message_with_enter_summary"
-            android:title="@string/settings_send_message_with_enter" />
+            android:title="@string/settings_send_message_with_enter"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
         <im.vector.riotx.core.preference.VectorListPreference
             android:defaultValue="always"
@@ -85,15 +94,17 @@
             android:entryValues="@array/show_info_area_values"
             android:key="SETTINGS_SHOW_INFO_AREA_KEY"
             android:summary="%s"
-            android:title="@string/settings_info_area_show" />
+            android:title="@string/settings_info_area_show"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider app:isPreferenceVisible="@bool/false_not_implemented" />
 
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_HOME_DISPLAY_KEY"
-        android:title="@string/settings_home_display">
+        android:title="@string/settings_home_display"
+        app:isPreferenceVisible="@bool/false_not_implemented">
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="true"
@@ -107,9 +118,11 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider app:isPreferenceVisible="@bool/false_not_implemented" />
 
-    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_media">
+    <im.vector.riotx.core.preference.VectorPreferenceCategory
+        android:title="@string/settings_media"
+        app:isPreferenceVisible="@bool/false_not_implemented">
 
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"
diff --git a/vector/src/main/res/xml/vector_settings_security_privacy.xml b/vector/src/main/res/xml/vector_settings_security_privacy.xml
index 49d782479d..dd6a89ff1f 100644
--- a/vector/src/main/res/xml/vector_settings_security_privacy.xml
+++ b/vector/src/main/res/xml/vector_settings_security_privacy.xml
@@ -22,7 +22,8 @@
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
             android:summary="@string/encryption_never_send_to_unverified_devices_summary"
-            android:title="@string/encryption_never_send_to_unverified_devices_title" />
+            android:title="@string/encryption_never_send_to_unverified_devices_title"
+            app:isPreferenceVisible="@bool/false_not_implemented" />
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
@@ -36,7 +37,7 @@
         <im.vector.riotx.core.preference.VectorPreference
             android:key="SETTINGS_SHOW_DEVICES_LIST_PREFERENCE_KEY"
             android:title="@string/settings_show_devices_list"
-            app:fragment="im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment"/>
+            app:fragment="im.vector.riotx.features.settings.devices.VectorSettingsDevicesFragment" />
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
@@ -63,11 +64,14 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-    <im.vector.riotx.core.preference.VectorPreferenceDivider android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY" />
+    <im.vector.riotx.core.preference.VectorPreferenceDivider
+        android:key="SETTINGS_CRYPTOGRAPHY_MANAGE_DIVIDER_PREFERENCE_KEY"
+        app:isPreferenceVisible="@bool/false_not_implemented" />
 
     <im.vector.riotx.core.preference.VectorPreferenceCategory
         android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
-        android:title="@string/settings_analytics">
+        android:title="@string/settings_analytics"
+        app:isPreferenceVisible="@bool/false_not_implemented">
 
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:defaultValue="false"
@@ -75,9 +79,15 @@
             android:summary="@string/settings_opt_in_of_analytics_summary"
             android:title="@string/settings_opt_in_of_analytics" />
 
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
+
+    <im.vector.riotx.core.preference.VectorPreferenceDivider />
+
+    <im.vector.riotx.core.preference.VectorPreferenceCategory android:title="@string/settings_rageshake">
+
         <im.vector.riotx.core.preference.VectorSwitchPreference
             android:key="SETTINGS_USE_RAGE_SHAKE_KEY"
             android:title="@string/send_bug_report_rage_shake" />
-    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
+    </im.vector.riotx.core.preference.VectorPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file