diff --git a/doc/source/configuring.rst b/doc/source/configuring.rst
index af330a3c3b..db5a602a3b 100644
--- a/doc/source/configuring.rst
+++ b/doc/source/configuring.rst
@@ -197,7 +197,7 @@ Optional. Default: The number of CPUs available will be used by default.
 Limits the maximum size of the x-openstack-request-id header which is
 logged. Affects only if context middleware is configured in pipeline.
 
-Optional. Default: ``0`` (Limited by max_header_line default: 16384)
+Optional. Default: ``64`` (Limited by max_header_line default: 16384)
 
 Configuring SSL Support
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/glance/api/middleware/context.py b/glance/api/middleware/context.py
index 3d2b0030bf..8245431d2b 100644
--- a/glance/api/middleware/context.py
+++ b/glance/api/middleware/context.py
@@ -38,7 +38,7 @@ context_opts = [
                 help=_('Allow unauthenticated users to access the API with '
                        'read-only privileges. This only applies when using '
                        'ContextMiddleware.')),
-    cfg.IntOpt('max_request_id_length', default=0,
+    cfg.IntOpt('max_request_id_length', default=64,
                help=_('Limits request ID length.')),
 ]