diff --git a/.gitignore b/.gitignore
index 87c9369..778d9ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,7 @@
 /target/
 /apiee-providers/target/
 /apiee-availability/target/
-/apiee-lite/target/
\ No newline at end of file
+/apiee-lite/target/
+\.idea/
+
+*.iml
diff --git a/apiee-core/src/main/java/com/github/phillipkruger/apiee/ApieeService.java b/apiee-core/src/main/java/com/github/phillipkruger/apiee/ApieeService.java
index 911d81a..c8042d2 100644
--- a/apiee-core/src/main/java/com/github/phillipkruger/apiee/ApieeService.java
+++ b/apiee-core/src/main/java/com/github/phillipkruger/apiee/ApieeService.java
@@ -113,14 +113,15 @@ private URL getOriginalRequestURL(HttpServletRequest request){
     }
     
     private int getOriginalRequestPort(HttpServletRequest request, String scheme){
-        // Try serverPort
-        int original = request.getServerPort();
-        if(original!=-1 && original>0 && original!=DEFAULT_HTTP_PORT && original!=DEFAULT_HTTPS_PORT)return original;        
-        
-        // Try header 
+
+        // Try header
         int portFromHeader = request.getIntHeader(X_FORWARDED_PORT);
         if(portFromHeader!=-1 && portFromHeader>0 && portFromHeader!=DEFAULT_HTTP_PORT && portFromHeader!=DEFAULT_HTTPS_PORT)return portFromHeader;
-        
+
+        // Try serverPort
+        int original = request.getServerPort();
+        if(original!=-1 && original>0 && original!=DEFAULT_HTTP_PORT && original!=DEFAULT_HTTPS_PORT)return original;
+
         // Try Url
         try {
             int portFromUrl = new URL(request.getRequestURL().toString()).getPort();