diff --git a/common/src/main/java/stirling/software/common/util/EmlToPdf.java b/common/src/main/java/stirling/software/common/util/EmlToPdf.java
index 0fb9f7d7b..94be53a3a 100644
--- a/common/src/main/java/stirling/software/common/util/EmlToPdf.java
+++ b/common/src/main/java/stirling/software/common/util/EmlToPdf.java
@@ -47,10 +47,6 @@ import stirling.software.common.model.api.converters.EmlToPdfRequest;
 public class EmlToPdf {
 
     private static Boolean jakartaMailAvailable = null;
-    @Getter
-    private static EmlToPdfRequest request;
-    @Getter
-    private static String fileName;
 
     private static boolean isJakartaMailAvailable() {
         if (jakartaMailAvailable == null) {
@@ -90,7 +86,7 @@ public class EmlToPdf {
             boolean disableSanitize,
             stirling.software.common.service.CustomPDFDocumentFactory pdfDocumentFactory)
             throws IOException, InterruptedException {
-        EmlToPdf.fileName = fileName;
+        // Remove static field assignment - now passing parameters directly
 
         if (emlBytes == null || emlBytes.length == 0) {
             throw new IllegalArgumentException("EML file is empty or null");
@@ -588,7 +584,7 @@ public class EmlToPdf {
     }
 
     private static void appendEnhancedStyles(StringBuilder html, EmlToPdfRequest request) {
-        EmlToPdf.request = request;
+        // Remove static field assignment - use parameter directly
         int fontSize = 12; // Default font size
 
         String textColor = "#202124";
@@ -1363,14 +1359,6 @@ public class EmlToPdf {
         }
     }
 
-    public static void setRequest(EmlToPdfRequest request) {
-        EmlToPdf.request = request;
-    }
-
-    public static void setFileName(String fileName) {
-        EmlToPdf.fileName = fileName;
-    }
-
     @Data
     public static class EmailContent {
         private String subject;
diff --git a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
index 3d02bd8d3..e76ba6c1b 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/converters/ConvertEmlToPDF.java
@@ -18,11 +18,11 @@ import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import stirling.software.common.configuration.RuntimePathConfig;
 import stirling.software.common.model.api.converters.EmlToPdfRequest;
 import stirling.software.common.service.CustomPDFDocumentFactory;
 import stirling.software.common.util.EmlToPdf;
 import stirling.software.common.util.WebResponseUtils;
-import stirling.software.common.configuration.RuntimePathConfig;
 
 @RestController
 @RequestMapping("/api/v1/convert")