diff --git a/src/messaging/create.js b/src/messaging/create.js
index fa83a22c42..ed6b0b6a33 100644
--- a/src/messaging/create.js
+++ b/src/messaging/create.js
@@ -48,10 +48,12 @@ module.exports = function (Messaging) {
 			timestamp: timestamp,
 			fromuid: uid,
 			roomId: roomId,
-			deleted: 0,
-			system: data.system || 0,
 		};
 
+		if (data.system) {
+			message.system = data.system;
+		}
+
 		if (data.ip) {
 			message.ip = data.ip;
 		}