diff --git a/samples/c2pa/C2paPlayer/C2paMenu/C2paMenu.js b/samples/c2pa/C2paPlayer/C2paMenu/C2paMenu.js
index 76f5fd9415..bbdbe6db9b 100644
--- a/samples/c2pa/C2paPlayer/C2paMenu/C2paMenu.js
+++ b/samples/c2pa/C2paPlayer/C2paMenu/C2paMenu.js
@@ -85,32 +85,35 @@ export var C2PAMenu = function () {
               }).format(date)
             : null;
         }
-        if (itemName == 'CLAIM_GENERATOR') {
-          generator = selectFormattedGenerator(activeManifest);
-          return generator ?? null;
-        }
+        // if (itemName == 'CLAIM_GENERATOR') {
+        //   generator = selectFormattedGenerator(activeManifest);
+        //   return generator ?? null;
+        // }
         if (itemName == 'NAME') {
           producer = selectProducer(activeManifest);
           return producer?.name ?? null;
         }
-        if (itemName == 'LOCATION') {
-          longitude =
-            activeManifest?.assertions.get('stds.exif')[0]?.data[
-              'EXIF:GPSLatitude'
-            ];
-          latitude =
-            activeManifest?.assertions.get('stds.exif')[0]?.data[
-              'EXIF:GPSLatitude'
-            ];
-          return [parseFloat(longitude), parseFloat(latitude)] ?? null;
-        }
+        // if (itemName == 'LOCATION') {
+        //   longitude =
+        //     activeManifest?.assertions.get('stds.exif')[0]?.data[
+        //       'EXIF:GPSLatitude'
+        //     ];
+        //   latitude =
+        //     activeManifest?.assertions.get('stds.exif')[0]?.data[
+        //       'EXIF:GPSLatitude'
+        //     ];
+        //   return [parseFloat(longitude), parseFloat(latitude)] ?? null;
+        // }
         if (itemName == 'WEBSITE') {
           website = activeManifest.assertions?.get(
             'stds.schema-org.CreativeWork',
           )[0]?.data.url;
           return website ?? null;
         }
-        if (itemName == 'SOCIAL') {
+        if (
+          itemName == 'SOCIAL' &&
+          selectSocialAccounts(activeManifest).length > 0
+        ) {
           socialMedia = selectSocialAccounts(activeManifest);
           return socialMedia?.map((account) => account['@id']) ?? null;
         }