diff --git a/src/android/org/linphone/LinphonePreferences.java b/src/android/org/linphone/LinphonePreferences.java
index 1fc5970cb..b2fcdc7f0 100644
--- a/src/android/org/linphone/LinphonePreferences.java
+++ b/src/android/org/linphone/LinphonePreferences.java
@@ -589,7 +589,9 @@ public class LinphonePreferences {
 		try {
 			LinphoneProxyConfig prxCfg = getProxyConfig(n);
 			prxCfg.edit();
-			prxCfg.getNatPolicy().setStunServer(stun);
+			LinphoneNatPolicy np = prxCfg.getNatPolicy();
+			np.setStunServer(stun);
+			np.enableStun(stun!=null);
 			prxCfg.done();
 		} catch (Exception e) {
 			Log.e(e);
diff --git a/submodules/linphone b/submodules/linphone
index ad493beca..e095830bb 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit ad493beca7a6a537629e2fb66e67d2f52c8c433f
+Subproject commit e095830bb6a6dda714f2ca9889888e2132659f91