diff --git a/rhodecode/lib/base.py b/rhodecode/lib/base.py
--- a/rhodecode/lib/base.py
+++ b/rhodecode/lib/base.py
@@ -43,15 +43,17 @@ def _get_ip_addr(environ):
 
     ip = environ.get(proxy_key2)
     if ip:
-        # HTTP_X_FORWARDED_FOR can have mutliple ips inside
-        # the left-most being the original client, and each successive proxy
-        # that passed the request adding the IP address where it received the
-        # request from.
-        if ',' in ip:
-            ip = ip.split(',')[0].strip()
         return ip
 
     ip = environ.get(def_key, '0.0.0.0')
+
+    # HEADERS can have mutliple ips inside
+    # the left-most being the original client, and each successive proxy
+    # that passed the request adding the IP address where it received the
+    # request from.
+    if ',' in ip:
+        ip = ip.split(',')[0].strip()
+
     return ip