diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 9b280dcd8..26256ea1e 100644
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -424,7 +424,8 @@ public interface LinphoneCore {
 	 * Sets the default proxy.
 	 *<br>
 	 * This default proxy must be part of the list of already entered {@link LinphoneProxyConfig}. 
-	 * Toggling it as default will make LinphoneCore use the identity associated with the proxy configuration in all incoming and outgoing calls.
+	 * Toggling it as default will make LinphoneCore favor the identity associated with the proxy configuration in all incoming and outgoing calls.
+	 * Better proxy configuration match may override this choice. Pass null to unset the default proxy.
 	 * @param proxyCfg 
 	 */
 	public void setDefaultProxyConfig(LinphoneProxyConfig proxyCfg);
diff --git a/java/impl/org/linphone/core/LinphoneCoreImpl.java b/java/impl/org/linphone/core/LinphoneCoreImpl.java
index 7b8e5e9ba..48aa5a939 100644
--- a/java/impl/org/linphone/core/LinphoneCoreImpl.java
+++ b/java/impl/org/linphone/core/LinphoneCoreImpl.java
@@ -207,7 +207,8 @@ class LinphoneCoreImpl implements LinphoneCore {
 
 	public synchronized void setDefaultProxyConfig(LinphoneProxyConfig proxyCfg) {
 		isValid();
-		setDefaultProxyConfig(nativePtr,((LinphoneProxyConfigImpl)proxyCfg).nativePtr);
+		long proxyPtr=proxyCfg != null ? ((LinphoneProxyConfigImpl)proxyCfg).nativePtr : 0;
+		setDefaultProxyConfig(nativePtr, proxyPtr);
 	}
 	public synchronized void addProxyConfig(LinphoneProxyConfig proxyCfg) throws LinphoneCoreException{
 		isValid();