diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
index 0020d1e9e3be..97f2f24fcb00 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java
@@ -551,19 +551,20 @@ private void removeE2E(PreferenceCategory preferenceCategoryMore) {
     }
 
     private void removeE2EFilesAndKeys(PreferenceCategory preferenceCategoryMore) {
-        if (BuildConfig.DEBUG) {
-            Preference removeKeysAndFilesPreference = findPreference("remove_e2e_files_and_keys");
-            if (removeKeysAndFilesPreference != null) {
-                if (!FileOperationsHelper.isEndToEndEncryptionSetup(this, user)) {
-                    preferenceCategoryMore.removePreference(removeKeysAndFilesPreference);
-                } else {
-                    removeKeysAndFilesPreference.setOnPreferenceClickListener(p -> {
-                        showRemoveE2EKeysAndFilesAlertDialog(preferenceCategoryMore, removeKeysAndFilesPreference);
-                        return true;
-                    });
-                }
-            }
+        Preference preference = findPreference("remove_e2e_files_and_keys");
+        if (preference == null) {
+            return;
+        }
+
+        if (!BuildConfig.DEBUG || !FileOperationsHelper.isEndToEndEncryptionSetup(this, user)) {
+            preferenceCategoryMore.removePreference(preference);
+            return;
         }
+
+        preference.setOnPreferenceClickListener(p -> {
+            showRemoveE2EKeysAndFilesAlertDialog(preferenceCategoryMore, preference);
+            return true;
+        });
     }
 
     private void showRemoveE2EKeysAndFilesAlertDialog(PreferenceCategory preferenceCategoryMore, Preference preference) {