diff --git a/src/logging/balena-backend.ts b/src/logging/balena-backend.ts
index 53497f12..0ab79e13 100644
--- a/src/logging/balena-backend.ts
+++ b/src/logging/balena-backend.ts
@@ -88,13 +88,13 @@ export class BalenaLogBackend extends LogBackend {
 			return;
 		}
 
-		message.timestamp ??= Date.now();
-		message.message ??= '';
-
 		if (!message.isSystem && message.serviceId == null) {
 			return;
 		}
 
+		message.timestamp ??= Date.now();
+		message.message ??= '';
+
 		message.message = _.truncate(message.message, {
 			length: MAX_LOG_LENGTH,
 			omission: '[...]',