diff --git a/src/mappings/metadataHelpers.template.ts b/src/mappings/metadataHelpers.template.ts
index bb832376..cd303f65 100644
--- a/src/mappings/metadataHelpers.template.ts
+++ b/src/mappings/metadataHelpers.template.ts
@@ -27,7 +27,9 @@ export function fetchGraphAccountMetadata(graphAccount: GraphAccount, ipfsHash:
       tlw.description = graphAccount.description
       tlw.image = graphAccount.image
       tlw.displayName = graphAccount.displayName
-      tlw.isOrganization = graphAccount.isOrganization
+      if (isOrganization != null && isOrganization.kind === JSONValueKind.BOOL) {
+        tlw.isOrganization = isOrganization.toBool()
+      }
       tlw.website = graphAccount.website
       tlw.save()
     }