diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 46f16d0676e7..d3f943a07001 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -100,8 +100,9 @@ class ClientRepository extends BaseRepository
         $contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts'];
         $contactIds = [];
 
+        // If the primary is set ensure it's listed first
         usort($contacts, function ($left, $right) {
-            return $right['is_primary'] - $left['is_primary'];
+            return (isset($right['is_primary']) ? $right['is_primary'] : 0) - (isset($left['is_primary']) ? $left['is_primary'] : 0);
         });
 
         foreach ($contacts as $contact) {