diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp
index f01208942..2a9992842 100644
--- a/src/c-wrapper/api/c-chat-message.cpp
+++ b/src/c-wrapper/api/c-chat-message.cpp
@@ -168,11 +168,12 @@ const char *linphone_chat_message_get_appdata(const LinphoneChatMessage *msg) {
 }
 
 void linphone_chat_message_set_appdata(LinphoneChatMessage *msg, const char *data) {
-	L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setAppdata(data);
+	L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setAppdata(L_C_TO_STRING(data));
 }
 
 void linphone_chat_message_set_from_address(LinphoneChatMessage *msg, const LinphoneAddress *from) {
-	L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setFromAddress(make_shared<LinphonePrivate::Address>(linphone_address_as_string(from)));
+	if (!from) L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setFromAddress(nullptr);
+	else L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setFromAddress(make_shared<LinphonePrivate::Address>(linphone_address_as_string(from)));
 }
 
 const LinphoneAddress *linphone_chat_message_get_from_address(LinphoneChatMessage *msg) {
@@ -183,7 +184,8 @@ const LinphoneAddress *linphone_chat_message_get_from_address(LinphoneChatMessag
 }
 
 void linphone_chat_message_set_to_address(LinphoneChatMessage *msg, const LinphoneAddress *to) {
-	L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setToAddress(make_shared<LinphonePrivate::Address>(linphone_address_as_string(to)));
+	if (!to) L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setToAddress(nullptr);
+	else L_GET_CPP_PTR_FROM_C_OBJECT(msg)->setToAddress(make_shared<LinphonePrivate::Address>(linphone_address_as_string(to)));
 }
 
 const LinphoneAddress *linphone_chat_message_get_to_address(LinphoneChatMessage *msg) {
diff --git a/src/chat/chat-room.cpp b/src/chat/chat-room.cpp
index ae5a8dc5f..2ea8fb67f 100644
--- a/src/chat/chat-room.cpp
+++ b/src/chat/chat-room.cpp
@@ -277,10 +277,8 @@ int ChatRoomPrivate::createChatMessageFromDb (int argc, char **argv, char **colN
 		if (atoi(argv[3]) == LinphoneChatMessageIncoming) {
 			linphone_chat_message_set_incoming(newMessage);
 			linphone_chat_message_set_from_address(newMessage, peer);
-			linphone_chat_message_set_to_address(newMessage, NULL);
 		} else {
 			linphone_chat_message_set_outgoing(newMessage);
-			linphone_chat_message_set_from_address(newMessage, NULL);
 			linphone_chat_message_set_to_address(newMessage, peer);
 		}
 		linphone_address_unref(peer);