diff --git a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
index 620fa0ee72894c5ef0b96c8dfd5b1ae9c52eed88..a0df50f3ed3843312e3dd40aa3b4bea811f9de49 100644
--- a/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
+++ b/src/main/java/edu/umd/dawn/common/interceptor/RequestInterceptor.java
@@ -112,7 +112,12 @@ public class RequestInterceptor implements HandlerInterceptor {
             userId = claims.getUserId();
         }
 
-        List<String> ips = List.of(Optional.of(request.getHeader("X-FORWARDED-FOR")).orElse(request.getRemoteAddr()).split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
+        String ipString = request.getHeader("X-FORWARDED-FOR") != null ? request.getHeader("X-FORWARDED-FOR") : request.getRemoteAddr();
+
+        List<String> ips = List.of();
+        if (ipString != null) {
+            ips = List.of(ipString.split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
+        }
 
         RequestLog requestLog = RequestLog.builder()
                 .path(path)