diff --git a/endpoints/keyserver/__init__.py b/endpoints/keyserver/__init__.py
index 7cab60b40..6588fd78b 100644
--- a/endpoints/keyserver/__init__.py
+++ b/endpoints/keyserver/__init__.py
@@ -61,7 +61,13 @@ def _lookup_service_key(service, signer_kid, approved_only=True):
 @key_server.route('/services/<service>/keys', methods=['GET'])
 def list_service_keys(service):
   keys = model.list_service_keys(service)
-  return jsonify({'keys': [key.jwk for key in keys]})
+
+  def jwk_with_kid(key):
+    jwk = key.jwk
+    jwk.update({'kid': key.kid})
+    return jwk
+
+  return jsonify({'keys': [jwk_with_kid(key) for key in keys]})
 
 
 @key_server.route('/services/<service>/keys/<kid>', methods=['GET'])