diff --git a/Classes/SettingsView.m b/Classes/SettingsView.m
index 13fe4e93d..05c30bfda 100644
--- a/Classes/SettingsView.m
+++ b/Classes/SettingsView.m
@@ -530,17 +530,8 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 			[LinphoneManager.instance lpConfigSetInt:10000000 forKey:@"auto_download_incoming_files_max_size"];
 			[keys addObject:@"auto_download_incoming_files_max_size"];
 			[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-		} else if([download_mode isEqualToString:@"Never"]){
-			[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"auto_download_mode_is_never"];
-			removeFromHiddenKeys = [download_mode isEqualToString:@"Never"];
-			if(![LinphoneManager.instance lpConfigBoolForKey:@"vfs_enabled_mode"])
-				[keys addObject:@"auto_write_to_gallery_mode"];
-			else
-				[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-			[hiddenKeys addObject:@"auto_download_incoming_files_max_size"];
 		} else {
 			[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"auto_download_mode_is_never"];
-			[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
 			[hiddenKeys addObject:@"auto_download_incoming_files_max_size"];
 		}
     }else if ([@"vfs_enabled_mode" compare:notif.object] == NSOrderedSame) {
@@ -550,22 +541,6 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 			[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
 			[hiddenKeys addObject:@"vfs_enabled_mode"];
 			[keys addObject:@"vfs_enabled"];
-		}else{
-			if(![LinphoneManager.instance lpConfigBoolForKey:@"auto_download_mode_is_never"]){
-				[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-			}
-		}
-	}
-	else if ([@"auto_write_to_gallery_mode" compare:notif.object] == NSOrderedSame) {
-		removeFromHiddenKeys = ![[notif.userInfo objectForKey:@"auto_write_to_gallery_mode"] boolValue];
-		if(![LinphoneManager.instance lpConfigBoolForKey:@"vfs_enabled_mode"]){
-			if(!removeFromHiddenKeys){
-				[LinphoneManager.instance lpConfigSetBool:TRUE forKey:@"auto_write_to_gallery_mode"];
-				[hiddenKeys addObject:@"auto_download_mode"];
-			}else{
-				[LinphoneManager.instance lpConfigSetBool:FALSE forKey:@"auto_write_to_gallery_mode"];
-				[keys addObject:@"auto_download_mode"];
-			}
 		}
 	}
 
@@ -812,10 +787,6 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
     if (![[lm lpConfigStringForKey:@"auto_download_mode"] isEqualToString:@"Customize"]) {
         [hiddenKeys addObject:@"auto_download_incoming_files_max_size"];
     }
-
-	if (![[lm lpConfigStringForKey:@"auto_download_mode"] isEqualToString:@"Never"]) {
-		[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-	}
 	
 	if ([lm lpConfigBoolForKey:@"vfs_enabled_mode"]) {
 		[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
@@ -823,10 +794,6 @@ void update_hash_cbs(LinphoneAccountCreator *creator, LinphoneAccountCreatorStat
 	}else{
 		[hiddenKeys addObject:@"vfs_enabled"];
 	}
-	
-	if ([lm lpConfigBoolForKey:@"auto_write_to_gallery_mode"]) {
-		[hiddenKeys addObject:@"auto_write_to_gallery_mode"];
-	}
 
 	return hiddenKeys;
 }