diff --git a/esi.module b/esi.module
index fe1d859..a77dca7 100755
--- a/esi.module
+++ b/esi.module
@@ -392,6 +392,8 @@ function esi__block_handler($bid, $page = NULL) {
       $q = variable_get('site_frontpage', 'node');
     }
     $_GET['q'] = $q;
+    global $base_path;
+    $_SERVER['REQUEST_URI'] = $base_path . $q;
   }
 
   // Load up the ESI configuration for this block.