diff --git a/client_tickets.php b/client_tickets.php
index 91356d37..ee43dce1 100644
--- a/client_tickets.php
+++ b/client_tickets.php
@@ -83,6 +83,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
                     $ticket_number = htmlentities($row['ticket_number']);
                     $ticket_subject = htmlentities($row['ticket_subject']);
                     $ticket_details = htmlentities($row['ticket_details']);
+                    $ticket_details_edit = $row['ticket_details']; // HTML Entities is used in the edit modal this is because tickets and ticket details share the edit modal and to prevent double html encoding causing output yuck
                     $ticket_priority = htmlentities($row['ticket_priority']);
                     $ticket_status = htmlentities($row['ticket_status']);
                     $ticket_created_at = htmlentities($row['ticket_created_at']);
diff --git a/ticket.php b/ticket.php
index bc896525..842a30bc 100644
--- a/ticket.php
+++ b/ticket.php
@@ -44,8 +44,8 @@ if (isset($_GET['ticket_id'])) {
         $ticket_number = intval($row['ticket_number']);
         $ticket_category = htmlentities($row['ticket_category']);
         $ticket_subject = htmlentities($row['ticket_subject']);
-        $ticket_details = $purifier->purify($row['ticket_details']);
-        //$ticket_details = $row['ticket_details'];
+        $ticket_details = $purifier->purify($row['ticket_details']); // We use Purify so HTML can be rendered securely on this page
+        $ticket_details_edit = $row['ticket_details']; // HTML Entities is used in the edit modal this is because tickets and ticket details share the edit modal and to prevent double html encoding causing output yuck
         $ticket_priority = htmlentities($row['ticket_priority']);
         //Set Ticket Bage Color based of priority
         if ($ticket_priority == "High") {
diff --git a/ticket_edit_modal.php b/ticket_edit_modal.php
index e245648a..ea4f3381 100644
--- a/ticket_edit_modal.php
+++ b/ticket_edit_modal.php
@@ -45,7 +45,7 @@
                             </div>
 
                             <div class="form-group">
-                                <textarea class="form-control summernote" rows="8" name="details" required><?php echo htmlentities($ticket_details); ?></textarea>
+                                <textarea class="form-control summernote" rows="8" name="details" required><?php echo htmlentities($ticket_details_edit); ?></textarea>
                             </div>
 
                             <div class="form-group">
diff --git a/tickets.php b/tickets.php
index 34e8ca1d..68904f35 100644
--- a/tickets.php
+++ b/tickets.php
@@ -262,6 +262,7 @@ $user_active_assigned_tickets = intval($row['total_tickets_assigned']);
                         $ticket_number = intval($row['ticket_number']);
                         $ticket_subject = htmlentities($row['ticket_subject']);
                         $ticket_details = htmlentities($row['ticket_details']);
+                        $ticket_details_edit = $row['ticket_details']; // HTML Entities is used in the edit modal this is because tickets and ticket details share the edit modal and to prevent double html encoding causing output yuck
                         $ticket_priority = htmlentities($row['ticket_priority']);
                         $ticket_status = htmlentities($row['ticket_status']);
                         $ticket_created_at = htmlentities($row['ticket_created_at']);