diff --git a/src/database.c b/src/database.c
index 4a0a4406..09402bc5 100644
--- a/src/database.c
+++ b/src/database.c
@@ -153,7 +153,7 @@ log_database_add(ProfMessage *message, gboolean is_muc) {
     //gchar *date_fmt = g_date_time_format_iso8601(message->timestamp);
     gchar *date_fmt = g_date_time_format(message->timestamp, "%Y/%m/%d %H:%M:%S");
     if (asprintf(&query, "INSERT INTO `ChatLogs` (`jid`, `resource`, `message`, `timestamp`, `is_muc`, `stanza_id`, `replace_id`) VALUES ('%s', '%s', '%s', '%s', '%d', '%s', '%s')",
-                message->jid->barejid, message->jid->resourcepart, message->plain, date_fmt, is_muc, message->id, message->replace_id) == -1) {
+                message->jid->barejid, message->jid->resourcepart, message->plain, date_fmt, is_muc, message->id ? message->id : "", message->replace_id ? message->replace_id : "") == -1) {
         log_error("log_database_add(): could not allocate memory");
         return;
     }