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 4e460dbcd086719a451121ca976af9498fe76c37..620fa0ee72894c5ef0b96c8dfd5b1ae9c52eed88 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,7 @@ public class RequestInterceptor implements HandlerInterceptor {
             userId = claims.getUserId();
         }
 
-        List<String> ips = List.of(Optional.of(request.getHeader("X-FORWARDED-FOR")).orElse("").split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
+        List<String> ips = List.of(Optional.of(request.getHeader("X-FORWARDED-FOR")).orElse(request.getRemoteAddr()).split(",")).stream().map(x -> x.trim()).collect(Collectors.toList());
 
         RequestLog requestLog = RequestLog.builder()
                 .path(path)