diff --git a/ts/util/combineNames.ts b/ts/util/combineNames.ts
index 7f83fe9524c3..eff282c46a63 100644
--- a/ts/util/combineNames.ts
+++ b/ts/util/combineNames.ts
@@ -44,10 +44,14 @@ export function combineNames(
   given?: string,
   family?: string
 ): undefined | string {
-  if (!given) {
+  if (!given && !family) {
     return undefined;
   }
 
+  if (!given) {
+    return family;
+  }
+
   // Users who haven't upgraded to dual-name, or went minimal, will just have a given name
   if (!family) {
     return given;