diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index 5badffe2f..6985dbd50 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -594,6 +594,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     
     BOOL wifiOnly = [self boolForKey:@"wifi_only_preference"];
 	lp_config_set_int(linphone_core_get_config(lc), LINPHONERC_APPLICATION_KEY, "wifi_only_preference", wifiOnly);
+    if([self valueChangedForKey:@"wifi_only_preference"]) {
+        [[LinphoneManager instance] setupNetworkReachabilityCallback];
+    }
     
 	NSString*  sharing_server = [self stringForKey:@"sharing_server_preference"];
 	[[LinphoneManager instance] lpConfigSetString:sharing_server forKey:@"sharing_server_preference"];
diff --git a/Classes/SettingsViewController.m b/Classes/SettingsViewController.m
index a08da9747..f84648481 100644
--- a/Classes/SettingsViewController.m
+++ b/Classes/SettingsViewController.m
@@ -585,6 +585,8 @@ static UICompositeViewDescription *compositeDescription = nil;
     [hiddenKeys addObject:@"incoming_call_timeout_preference"];
     [hiddenKeys addObject:@"in_call_timeout_preference"];
     
+    [hiddenKeys addObject:@"wifi_only_preference"];
+    
     [hiddenKeys addObject:@"quit_button"]; // Hide for the moment
     [hiddenKeys addObject:@"about_button"]; // Hide for the moment