diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45f7de92..87deca88 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ This file documents all notable changes made to ITFlow.
 - Added Create New Ticket while in project details section.
 - Brought back Batch Payment in client invoices.
 - Added client abbrevation to client and global search options.
+- Added User / Asset Software Assigned Licenses to Client PDF Export.
 
 
 ### Breaking Changes
diff --git a/post/user/client.php b/post/user/client.php
index 4672ef5d..9feb869d 100644
--- a/post/user/client.php
+++ b/post/user/client.php
@@ -677,6 +677,8 @@ if (isset($_POST['export_client_pdf'])) {
             contacts ON software_contacts.contact_id = contacts.contact_id
         JOIN 
             software ON software_contacts.software_id = software.software_id
+        WHERE software_archived_at IS NULL
+        AND contact_archived_at IS NULL
         ORDER BY 
             contact_name, software_name;"
     );
@@ -691,6 +693,8 @@ if (isset($_POST['export_client_pdf'])) {
             assets ON software_assets.asset_id = assets.asset_id
         JOIN 
             software ON software_assets.software_id = software.software_id
+        WHERE software_archived_at IS NULL
+        AND asset_archived_at IS NULL
         ORDER BY 
             asset_name, software_name;"
     );