diff --git a/Source/santactl/Commands/SNTCommandFileInfo.m b/Source/santactl/Commands/SNTCommandFileInfo.m
index a3b086bf9..bcc21d6e0 100644
--- a/Source/santactl/Commands/SNTCommandFileInfo.m
+++ b/Source/santactl/Commands/SNTCommandFileInfo.m
@@ -388,10 +388,8 @@ - (SNTAttributeBlock)rule {
     if (identifier) {
       if (teamID) {
         signingID = [NSString stringWithFormat:@"%@:%@", teamID, identifier];
-      } else {
-        if (csc.platformBinary) {
-          signingID = [NSString stringWithFormat:@"platform:%@", identifier];
-        }
+      } else if (csc.platformBinary) {
+        signingID = [NSString stringWithFormat:@"platform:%@", identifier];
       }
     }
 
@@ -524,7 +522,16 @@ - (SNTAttributeBlock)teamID {
 - (SNTAttributeBlock)signingID {
   return ^id(SNTCommandFileInfo *cmd, SNTFileInfo *fileInfo) {
     MOLCodesignChecker *csc = [fileInfo codesignCheckerWithError:NULL];
-    return csc.signingID;
+
+    NSString *identifier = csc.signingID;
+    NSString *teamID = csc.teamID;
+    if (!identifier) return nil;
+    if (teamID) {
+      return [NSString stringWithFormat:@"%@:%@", teamID, identifier];
+    } else if (csc.platformBinary) {
+      return [NSString stringWithFormat:@"platform:%@", identifier];
+    }
+    return nil;
   };
 }