diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index b33715a94..163225b6d 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -4544,6 +4544,7 @@ extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_setListener(JNIEn
 extern "C" void Java_org_linphone_core_LinphoneChatMessageImpl_unref(JNIEnv*  env
 																		 ,jobject  thiz
 																		 ,jlong ptr) {
+	linphone_chat_message_set_user_data((LinphoneChatMessage*)ptr, NULL);
 	linphone_chat_message_unref((LinphoneChatMessage*)ptr);
 }