diff --git a/react-app/src/api/submissionService.ts b/react-app/src/api/submissionService.ts
index 2620d97d09..92185a3581 100644
--- a/react-app/src/api/submissionService.ts
+++ b/react-app/src/api/submissionService.ts
@@ -63,7 +63,10 @@ export const buildSubmissionPayload = <T extends Record<string, unknown>>(
 ) => {
   const userDetails = {
     submitterEmail: user?.user?.email ?? "N/A",
-    submitterName: `${user?.user?.given_name} ${user?.user?.family_name}`,
+    submitterName:
+      user?.user?.given_name && user?.user?.family_name
+        ? `${user.user.given_name} ${user.user.family_name}`
+        : "N/A",
   };
   const baseProperties = {
     authority: authority,