diff --git a/obexd/client/mns.c b/obexd/client/mns.c
index d638886..124dbcf 100644
--- a/obexd/client/mns.c
+++ b/obexd/client/mns.c
@@ -194,6 +194,8 @@ static void parse_event_report_folder(struct map_event *event,
 	if (!value)
 		return;
 
+	g_free(event->folder);
+
 	if (g_str_has_prefix(value, "/"))
 		event->folder = g_strdup(value);
 	else
@@ -206,6 +208,8 @@ static void parse_event_report_old_folder(struct map_event *event,
 	if (!value)
 		return;
 
+	g_free(event->old_folder);
+
 	if (g_str_has_prefix(value, "/"))
 		event->old_folder = g_strdup(value);
 	else
@@ -215,6 +219,10 @@ static void parse_event_report_old_folder(struct map_event *event,
 static void parse_event_report_msg_type(struct map_event *event,
 							const char *value)
 {
+	if (!value)
+		return;
+
+	g_free(event->msg_type);
 	event->msg_type = g_strdup(value);
 }