diff --git a/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch b/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch
index 4c9495b63b..a4f704f9e9 100644
--- a/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/network/LegacyQueryHandler.java.patch
@@ -35,8 +35,9 @@
 +                com.destroystokyo.paper.event.server.PaperServerListPingEvent event; // Paper
  
                  if (i == 0) {
-                     LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress);
+-                    LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", socketaddress);
 -                    s = LegacyQueryHandler.createVersion0Response(this.server);
++                    LegacyQueryHandler.LOGGER.debug("Ping: (<1.3.x) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: "<ip address withheld>"); // Paper - Respect logIPs option
 +
 +                    // Paper start - Call PaperServerListPingEvent and use results
 +                    event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(net.minecraft.server.MinecraftServer.getServer(), (java.net.InetSocketAddress) socketaddress, 39, null);
@@ -73,7 +74,8 @@
 +                        // LegacyQueryHandler.LOGGER.debug("Ping: (1.6) from {}", socketaddress);
 +                        // Paper end
                      } else {
-                         LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress);
+-                        LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", socketaddress);
++                        LegacyQueryHandler.LOGGER.debug("Ping: (1.4-1.5.x) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? socketaddress: "<ip address withheld>"); // Paper - Respect logIPs option
                      }
  
 -                    s = LegacyQueryHandler.createVersion1Response(this.server);
@@ -159,7 +161,7 @@
 +        buf.release();
 +        this.buf = null;
 +
-+        LOGGER.debug("Ping: (1.6) from {}", ctx.channel().remoteAddress());
++        LOGGER.debug("Ping: (1.6) from {}", net.minecraft.server.MinecraftServer.getServer().logIPs() ? ctx.channel().remoteAddress(): "<ip address withheld>"); // Paper - Respect logIPs option
 +
 +        java.net.InetSocketAddress virtualHost = com.destroystokyo.paper.network.PaperNetworkClient.prepareVirtualHost(host, port);
 +        com.destroystokyo.paper.event.server.PaperServerListPingEvent event = com.destroystokyo.paper.network.PaperLegacyStatusClient.processRequest(