diff --git a/Source/santabundleservice/SNTBundleService.m b/Source/santabundleservice/SNTBundleService.m
index fe275b3f9..893d18836 100644
--- a/Source/santabundleservice/SNTBundleService.m
+++ b/Source/santabundleservice/SNTBundleService.m
@@ -226,9 +226,17 @@ - (NSDictionary *)generateEventsFromBinaries:(NSArray *)fis
 
       MOLCodesignChecker *cs = [fi codesignCheckerWithError:NULL];
       se.signingChain = cs.certificates;
-      se.teamID = cs.teamID;
-      se.signingID = cs.signingID;
       se.cdhash = cs.cdhash;
+      se.teamID = cs.teamID;
+      if (cs.signingID) {
+        if (cs.teamID) {
+          se.signingID = [NSString stringWithFormat:@"%@:%@", cs.teamID, cs.signingID];
+        } else {
+          if (cs.platformBinary) {
+            se.signingID = [NSString stringWithFormat:@"platform:%@", cs.signingID];
+          }
+        }
+      }
 
       dispatch_sync(dispatch_get_main_queue(), ^{
         relatedEvents[se.fileSHA256] = se;