diff --git a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
index f8f44fc7a3d9..797a479a2dc2 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/report/ComponentsPublisher.java
@@ -63,12 +63,18 @@ private void recursiveWriteComponent(BatchResource batchResource, BatchOutputWri
 
     // non-null fields
     builder.setRef(batchResource.batchId());
-    builder.setSnapshotId(batchResource.snapshotId());
-    builder.setUuid(r.getUuid());
     builder.setType(getType(r));
 
     // protocol buffers does not accept null values
 
+    String uuid = r.getUuid();
+    if (uuid != null) {
+      builder.setUuid(uuid);
+    }
+    Integer sid = batchResource.snapshotId();
+    if (sid != null) {
+      builder.setSnapshotId(sid);
+    }
     if (ResourceUtils.isFile(r)) {
       builder.setIsTest(ResourceUtils.isUnitTestClass(r));
     }