diff --git a/portal/ticket.php b/portal/ticket.php
index be0598966..0c6914e72 100644
--- a/portal/ticket.php
+++ b/portal/ticket.php
@@ -52,6 +52,13 @@
         $ticket_closed_at = nullable_htmlentities($ticket_row['ticket_closed_at']);
         $ticket_feedback = nullable_htmlentities($ticket_row['ticket_feedback']);
 
+        // Get Ticket Attachments (not associated with a specific reply)
+        $sql_ticket_attachments = mysqli_query(
+            $mysqli,
+            "SELECT * FROM ticket_attachments
+            WHERE ticket_attachment_reply_id IS NULL
+            AND ticket_attachment_ticket_id = $ticket_id"
+        );
 
         // Get Tasks
         $sql_tasks = mysqli_query( $mysqli, "SELECT * FROM tasks WHERE task_ticket_id = $ticket_id ORDER BY task_order ASC, task_id ASC");
@@ -106,6 +113,14 @@
                     <?php } ?>
                 </p>
                 <?php echo $ticket_details ?>
+
+                <?php
+                while ($ticket_attachment = mysqli_fetch_array($sql_ticket_attachments)) {
+                    $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']);
+                    $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']);
+                    echo "<hr class=''><i class='fas fa-fw fa-paperclip text-secondary mr-1'></i>$name | <a target='_blank' href='https://$config_base_url/uploads/tickets/$ticket_id/$ref_name'><i class='fas fa-fw fa-external-link-alt mr-1'></i>View</a>";
+                }
+                ?>
             </div>
         </div>
 
@@ -195,6 +210,14 @@
                 $user_initials = initials($row['user_name']);
                 $avatar_link = "../uploads/users/$user_id/$user_avatar";
             }
+
+            // Get attachments for this reply
+            $sql_ticket_reply_attachments = mysqli_query(
+                $mysqli,
+                "SELECT * FROM ticket_attachments
+                        WHERE ticket_attachment_reply_id = $ticket_reply_id
+                        AND ticket_attachment_ticket_id = $ticket_id"
+            );
             ?>
 
             <div class="card card-outline <?php if ($ticket_reply_type == 'Client') { echo "card-warning"; } else { echo "card-info"; } ?> mb-3">
@@ -227,6 +250,14 @@
 
                 <div class="card-body prettyContent">
                     <?php echo $ticket_reply; ?>
+
+                    <?php
+                    while ($ticket_attachment = mysqli_fetch_array($sql_ticket_reply_attachments)) {
+                        $name = nullable_htmlentities($ticket_attachment['ticket_attachment_name']);
+                        $ref_name = nullable_htmlentities($ticket_attachment['ticket_attachment_reference_name']);
+                        echo "<hr><i class='fas fa-fw fa-paperclip text-secondary mr-1'></i>$name | <a target='_blank' href='https://$config_base_url/uploads/tickets/$ticket_id/$ref_name'><i class='fas fa-fw fa-external-link-alt mr-1'></i>View</a>";
+                    }
+                    ?>
                 </div>
             </div>