diff --git a/server/server.go b/server/server.go
index de1886851..a602d969a 100644
--- a/server/server.go
+++ b/server/server.go
@@ -56,7 +56,9 @@ func (s *Server) initRoutes() {
 	r.Use(secureMiddleware())
 	r.Use(cors.AllowAll().Handler)
 	r.Use(middleware.RequestID)
-	r.Use(middleware.RealIP)
+	if conf.Server.ReverseProxyWhitelist == "" {
+		r.Use(middleware.RealIP)
+	}
 	r.Use(middleware.Recoverer)
 	r.Use(middleware.Compress(5, "application/xml", "application/json", "application/javascript"))
 	r.Use(middleware.Heartbeat("/ping"))