diff --git a/lib/puma/client.rb b/lib/puma/client.rb
index 5a937e7f79..690af4503f 100644
--- a/lib/puma/client.rb
+++ b/lib/puma/client.rb
@@ -126,7 +126,7 @@ def reset(fast_check=true)
       @parsed_bytes = 0
       @ready = false
       @body_remain = 0
-      @peerip = nil
+      @peerip = nil if @remote_addr_header
       @in_last_chunk = false
 
       if @buffer