diff --git a/rest/httpx/util.go b/rest/httpx/util.go
index 2f7c9755..a5f5196f 100644
--- a/rest/httpx/util.go
+++ b/rest/httpx/util.go
@@ -10,5 +10,6 @@ func GetRemoteAddr(r *http.Request) string {
 	if len(v) > 0 {
 		return v
 	}
+
 	return r.RemoteAddr
 }
diff --git a/rest/httpx/util_test.go b/rest/httpx/util_test.go
index ccef347c..8e804cbf 100644
--- a/rest/httpx/util_test.go
+++ b/rest/httpx/util_test.go
@@ -16,3 +16,10 @@ func TestGetRemoteAddr(t *testing.T) {
 	r.Header.Set(xForwardedFor, host)
 	assert.Equal(t, host, GetRemoteAddr(r))
 }
+
+func TestGetRemoteAddrNoHeader(t *testing.T) {
+	r, err := http.NewRequest(http.MethodGet, "/", strings.NewReader(""))
+	assert.Nil(t, err)
+
+	assert.True(t, len(GetRemoteAddr(r)) == 0)
+}