diff --git a/endpoints/web.py b/endpoints/web.py
index cbca6c7cf..da8ad2f05 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -58,10 +58,11 @@ def index(path, **kwargs):
 def internal_error_display():
   return render_page_template('500.html')
 
-@web.errorhandler(404)
-@web.route('/404', methods=['GET'])
-def not_found_error_display(e = None):
-  return render_page_template('404.html')
+#TODO: reenable once fixed
+#@web.errorhandler(404)
+#@web.route('/404', methods=['GET'])
+#def not_found_error_display(e = None):
+#  return render_page_template('404.html')
 
 @web.route('/organization/<path:path>', methods=['GET'])
 @no_cache