diff --git a/common/framework/debug.php b/common/framework/debug.php
index d606f1723..bf2227904 100644
--- a/common/framework/debug.php
+++ b/common/framework/debug.php
@@ -449,6 +449,14 @@ class Debug
 				{
 					return $cache = true;
 				}
+				if (\RX_CLIENT_IP === '127.0.0.1' || \RX_CLIENT_IP === '::1')
+				{
+					return $cache = true;
+				}
+				if (\RX_CLIENT_IP === $_SERVER['SERVER_ADDR'] || \RX_CLIENT_IP === $_SERVER['LOCAL_ADDR'])
+				{
+					return $cache = true;
+				}
 				return $cache = false;
 			
 			case 'admin':
diff --git a/common/tpl/debug_comment.html b/common/tpl/debug_comment.html
index ca05800df..3e9741aee 100644
--- a/common/tpl/debug_comment.html
+++ b/common/tpl/debug_comment.html
@@ -6,6 +6,7 @@
 Request / Response
 ==================
 Request URL:         <?php echo $data->url . "\n"; ?>
+Request IP Address:  <?php echo \RX_CLIENT_IP . "\n"; ?>
 Request Method:      <?php echo $data->request->method . "\n" ?>
 Request Body Size:   <?php echo $data->request->size . "\n" ?>
 Response Method:     <?php echo $data->response->method . "\n"; ?>