diff --git a/app/destinations/resources/classes/destinations.php b/app/destinations/resources/classes/destinations.php
index d95d234d2e..399c6c44dd 100644
--- a/app/destinations/resources/classes/destinations.php
+++ b/app/destinations/resources/classes/destinations.php
@@ -502,8 +502,9 @@ if (!class_exists('destinations')) {
 				foreach($_SESSION['destinations']['array'][$destination_type] as $key => $value) {
 					if ($key == $destination_key) {
 						foreach($value as $k => $row) {
-							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : ''; 
-							$response .= "		<option id='{$row[$this->singular($key).'_uuid']}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
+							$selected = ($row['destination'] == $destination_value) ? "selected='selected'" : '';
+							$uuid = $row[$this->singular($key).'_uuid'] ?? $row['uuid'];
+							$response .= "		<option id='{$uuid}' value='".$row['destination']."' $selected>".$row['label']."</option>\n";
 						}
 					}
 				}
diff --git a/app/destinations/resources/destinations.php b/app/destinations/resources/destinations.php
index 29595bf316..bd046637d1 100644
--- a/app/destinations/resources/destinations.php
+++ b/app/destinations/resources/destinations.php
@@ -51,7 +51,8 @@
 					$select_label = str_replace('email-icon', '&#9993', $select_label);
 
 					//add the select option
-					echo "		<option id='{$row[$singular.'_uuid']}' value='".$select_value."'>".$select_label."</option>\n";
+					$uuid = $row[$singular.'_uuid'] ?? $row['uuid'];
+					echo "		<option id='{$uuid}' value='".$select_value."'>".$select_label."</option>\n";
 				}
 			}
 		}