diff --git a/calendar_event_add_modal.php b/calendar_event_add_modal.php
index a372f4a2..d32c752b 100644
--- a/calendar_event_add_modal.php
+++ b/calendar_event_add_modal.php
@@ -117,7 +117,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id ORDER BY client_name ASC");
+                                            $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql)) {
                                                 $client_id = intval($row['client_id']);
                                                 $client_name = nullable_htmlentities($row['client_name']);
diff --git a/calendar_event_edit_modal.php b/calendar_event_edit_modal.php
index 0c279df5..7ad9fe21 100644
--- a/calendar_event_edit_modal.php
+++ b/calendar_event_edit_modal.php
@@ -116,7 +116,7 @@
                                             <option value="">- Client -</option>
                                             <?php
 
-                                            $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON primary_contact = contact_id ORDER BY client_name ASC");
+                                            $sql_clients = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN contacts ON clients.client_id = contacts.contact_client_id AND contact_primary = 1 ORDER BY client_name ASC");
                                             while ($row = mysqli_fetch_array($sql_clients)) {
                                                 $client_id_select = intval($row['client_id']);
                                                 $client_name_select = nullable_htmlentities($row['client_name']);