diff --git a/CHANGES b/CHANGES
index 2ffed60f..8285fb95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 09 May 2008 - 2.5.5-dev1
 ------------------------
 
+* Fixed blocking in phase 3.
+
 * Force modules "mod_rpaf-2.0.c" and "mod_custom_header.c" to run before
   ModSecurity so that the correct IP is used.
 
diff --git a/apache2/mod_security2.c b/apache2/mod_security2.c
index 3ce50296..5a6d7ac2 100644
--- a/apache2/mod_security2.c
+++ b/apache2/mod_security2.c
@@ -961,6 +961,8 @@ static void hook_insert_filter(request_rec *r) {
     }
 }
 
+/* NOTE: This is causing and endless loop when blocking in phase:3 */
+#if 0
 /**
  * Invoked whenever Apache starts processing an error. A chance
  * to insert ourselves into the output filter chain.
@@ -1002,6 +1004,7 @@ static void hook_insert_error_filter(request_rec *r) {
         }
     }
 }
+#endif
 
 #if (!defined(NO_MODSEC_API))
 /**
@@ -1102,7 +1105,9 @@ static void register_hooks(apr_pool_t *mp) {
 
     /* Filter hooks */
     ap_hook_insert_filter(hook_insert_filter, NULL, NULL, APR_HOOK_FIRST);
+#if 0
     ap_hook_insert_error_filter(hook_insert_error_filter, NULL, NULL, APR_HOOK_FIRST);
+#endif
 
     ap_register_input_filter("MODSECURITY_IN", input_filter,
         NULL, AP_FTYPE_CONTENT_SET);