diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index a2aca66a40..78127077fd 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -1,3 +1,4 @@
+
 <?php
 /*
 	FusionPBX
@@ -138,6 +139,7 @@
 						}
 					}
 				}
+				unset($row);
 			}
 	}
 
@@ -270,7 +272,7 @@
 					$destination_caller_id_number = $row["destination_caller_id_number"] ?? null;
 				}
 				if (!permission_exists('destination_context')) {
-					$destination_context = $row["destination_context"] ?? null;
+					$destination_context = $row["destination_context"] ?? 'public';
 				}
 				if (!permission_exists('destination_fax')) {
 					$fax_uuid = $row["fax_uuid"] ?? null;