diff --git a/src/main/java/stirling/software/SPDF/SPdfApplication.java b/src/main/java/stirling/software/SPDF/SPdfApplication.java
index aab480ba3de..a7ce7f14cc3 100644
--- a/src/main/java/stirling/software/SPDF/SPdfApplication.java
+++ b/src/main/java/stirling/software/SPDF/SPdfApplication.java
@@ -17,7 +17,7 @@
 
 @EnableScheduling
 public class SPdfApplication {
-	
+
 	@Autowired
     private Environment env;
 
@@ -29,11 +29,7 @@ public void init() {
 
         if (browserOpen) {
             try {
-                String port = env.getProperty("local.server.port");
-                if(port == null || port.length() == 0) {
-                	port="8080";
-                }
-                String url = "http://localhost:" + port;
+                String url = "http://localhost:" + getPort();
 
                 String os = System.getProperty("os.name").toLowerCase();
                 Runtime rt = Runtime.getRuntime();
@@ -46,7 +42,7 @@ public void init() {
             }
         }
     }
-	
+
     public static void main(String[] args) {
     	SpringApplication app = new SpringApplication(SPdfApplication.class);
     	app.addInitializers(new ConfigInitializer());
@@ -56,28 +52,28 @@ public static void main(String[] args) {
             System.out.println("External configuration file 'configs/settings.yml' does not exist. Using default configuration and environment configuration instead.");
         }
         app.run(args);
-        
+
         try {
 			Thread.sleep(1000);
 		} catch (InterruptedException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-        
+
         GeneralUtils.createDir("customFiles/static/");
         GeneralUtils.createDir("customFiles/templates/");
-        
-        
-        
+
         System.out.println("Stirling-PDF Started.");
-        
+
+        String url = "http://localhost:" + getPort();
+        System.out.println("Navigate to " + url);
+    }
+
+    public static String getPort() {
         String port = System.getProperty("local.server.port");
-        if(port == null || port.length() == 0) {
-        	port="8080";
+        if (port == null || port.isEmpty()) {
+            port = "8080";
         }
-        String url = "http://localhost:" + port;
-        System.out.println("Navigate to " + url);
+        return port;
     }
-    
-    
-}
\ No newline at end of file
+}
diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
index 43448f898dc..3eda502b0e2 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/ApiDocService.java
@@ -16,8 +16,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import jakarta.servlet.ServletContext;
+
+import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.ApiEndpoint;
 import stirling.software.SPDF.model.Role;
+
 @Service
 public class ApiDocService {
 
@@ -28,11 +31,8 @@ public class ApiDocService {
 
     private String getApiDocsUrl() {
         String contextPath = servletContext.getContextPath();
-        String port = System.getProperty("local.server.port");
-        if(port == null || port.length() == 0) {
-        	port="8080";
-        }
-        
+        String port = SPdfApplication.getPort();
+
         return "http://localhost:"+ port + contextPath + "/v1/api-docs";
     }
     
diff --git a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
index 1ac7eef9e61..2fad339bd35 100644
--- a/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
+++ b/src/main/java/stirling/software/SPDF/controller/api/pipeline/PipelineProcessor.java
@@ -34,6 +34,8 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import jakarta.servlet.ServletContext;
+
+import stirling.software.SPDF.SPdfApplication;
 import stirling.software.SPDF.model.PipelineConfig;
 import stirling.software.SPDF.model.PipelineOperation;
 import stirling.software.SPDF.model.Role;
@@ -65,7 +67,9 @@ private String getApiKeyForUser() {
 
 	private String getBaseUrl() {
 		String contextPath = servletContext.getContextPath();
-		return "http://localhost:8080" + contextPath + "/";
+		String port = SPdfApplication.getPort();
+
+		return "http://localhost:" + port + contextPath + "/";
 	}