diff --git a/libraries/nestjs-libraries/src/bull-mq-transport/client/bull-mq.client.ts b/libraries/nestjs-libraries/src/bull-mq-transport/client/bull-mq.client.ts
index 2ea68379..356db032 100644
--- a/libraries/nestjs-libraries/src/bull-mq-transport/client/bull-mq.client.ts
+++ b/libraries/nestjs-libraries/src/bull-mq-transport/client/bull-mq.client.ts
@@ -58,6 +58,8 @@ export class BullMqClient extends ClientProxy {
     queue
       .add(packet.pattern, packet.data, {
         jobId: packet.data.id ?? v4(),
+        removeOnComplete: true,
+        removeOnFail: true,
         ...packet.data.options,
       })
       .then(async (job) => {
diff --git a/libraries/nestjs-libraries/src/bull-mq-transport/server/bull-mq.server.ts b/libraries/nestjs-libraries/src/bull-mq-transport/server/bull-mq.server.ts
index 39c6803e..3aef1bc5 100644
--- a/libraries/nestjs-libraries/src/bull-mq-transport/server/bull-mq.server.ts
+++ b/libraries/nestjs-libraries/src/bull-mq-transport/server/bull-mq.server.ts
@@ -46,10 +46,9 @@ export class BullMqServer extends Server implements CustomTransportStrategy {
               });
             });
           },
-          // @ts-ignore
           {
             ...this.options,
-            ...{ removeOnComplete: true, removeOnFail: true },
+            ...{ removeOnComplete: { count: 0 }, removeOnFail: { count: 0 } },
             ...handler?.extras,
           }
         );