diff --git a/src/lib/ResponseBodyBuilder.ts b/src/lib/ResponseBodyBuilder.ts
index 1b310e53..880e506a 100644
--- a/src/lib/ResponseBodyBuilder.ts
+++ b/src/lib/ResponseBodyBuilder.ts
@@ -51,7 +51,7 @@ export class ResponseBodyBuilder {
     if (!threatModelingDate) {
       return this;
     } else {
-      if (!tmNumberOfActiveTickets && !tmNumberOfClosedTickets) {
+      if ((!tmNumberOfActiveTickets && !tmNumberOfClosedTickets) || ((tmNumberOfActiveTickets && tmNumberOfClosedTickets) !== '')) {
         this.responseBody.tmNumberOfActiveTickets = tmNumberOfActiveTickets;
         this.responseBody.tmNumberOfClosedTickets = tmNumberOfClosedTickets;
       }
@@ -135,7 +135,7 @@ export class ResponseBodyBuilder {
     if (!pentestDate) {
       return this;
     } else {
-      if (!ptNumberOfActiveTickets && !ptNumberOfClosedTickets) {
+      if ((!ptNumberOfActiveTickets && !ptNumberOfClosedTickets) || ((ptNumberOfActiveTickets && ptNumberOfClosedTickets) !== '')) {
         this.responseBody.ptNumberOfActiveTickets = ptNumberOfActiveTickets;
         this.responseBody.ptNumberOfClosedTickets = ptNumberOfClosedTickets;
       }