diff --git a/services/identity/src/grpc_services/authenticated.rs b/services/identity/src/grpc_services/authenticated.rs
--- a/services/identity/src/grpc_services/authenticated.rs
+++ b/services/identity/src/grpc_services/authenticated.rs
@@ -298,16 +298,9 @@
       ));
     };
 
-    let primary_device_data = self
-      .db_client
-      .get_primary_device_data(&message.user_id)
-      .await?;
-    let primary_device_keys = primary_device_data.device_key_info;
-
     let response = Response::new(KeyserverKeysResponse {
       keyserver_info: Some(keyserver_info.into()),
       identity: Some(identifier.into()),
-      primary_device_identity_info: Some(primary_device_keys.into()),
     });
 
     return Ok(response);
diff --git a/shared/protos/identity_auth.proto b/shared/protos/identity_auth.proto
--- a/shared/protos/identity_auth.proto
+++ b/shared/protos/identity_auth.proto
@@ -150,9 +150,13 @@
 }
 
 message KeyserverKeysResponse {
+  // this was never used, we can reuse this field again
+  // when min supported version is FUTURE_CODE_VERSION
+  reserved 3;
+  reserved "primary_device_identity_info";
+
   OutboundKeyInfo keyserver_info = 1;
   Identity identity = 2;
-  identity.unauth.IdentityKeyInfo primary_device_identity_info = 3;
 }
 
 // GetOutboundKeysForUser
diff --git a/web/protobufs/identity-auth-structs.cjs b/web/protobufs/identity-auth-structs.cjs
--- a/web/protobufs/identity-auth-structs.cjs
+++ b/web/protobufs/identity-auth-structs.cjs
@@ -1936,8 +1936,7 @@
 proto.identity.auth.KeyserverKeysResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
     keyserverInfo: (f = msg.getKeyserverInfo()) && proto.identity.auth.OutboundKeyInfo.toObject(includeInstance, f),
-    identity: (f = msg.getIdentity()) && proto.identity.auth.Identity.toObject(includeInstance, f),
-    primaryDeviceIdentityInfo: (f = msg.getPrimaryDeviceIdentityInfo()) && identity_unauth_pb.IdentityKeyInfo.toObject(includeInstance, f)
+    identity: (f = msg.getIdentity()) && proto.identity.auth.Identity.toObject(includeInstance, f)
   };
 
   if (includeInstance) {
@@ -1984,11 +1983,6 @@
       reader.readMessage(value,proto.identity.auth.Identity.deserializeBinaryFromReader);
       msg.setIdentity(value);
       break;
-    case 3:
-      var value = new identity_unauth_pb.IdentityKeyInfo;
-      reader.readMessage(value,identity_unauth_pb.IdentityKeyInfo.deserializeBinaryFromReader);
-      msg.setPrimaryDeviceIdentityInfo(value);
-      break;
     default:
       reader.skipField();
       break;
@@ -2034,14 +2028,6 @@
       proto.identity.auth.Identity.serializeBinaryToWriter
     );
   }
-  f = message.getPrimaryDeviceIdentityInfo();
-  if (f != null) {
-    writer.writeMessage(
-      3,
-      f,
-      identity_unauth_pb.IdentityKeyInfo.serializeBinaryToWriter
-    );
-  }
 };
 
 
@@ -2119,43 +2105,6 @@
 };
 
 
-/**
- * optional identity.unauth.IdentityKeyInfo primary_device_identity_info = 3;
- * @return {?proto.identity.unauth.IdentityKeyInfo}
- */
-proto.identity.auth.KeyserverKeysResponse.prototype.getPrimaryDeviceIdentityInfo = function() {
-  return /** @type{?proto.identity.unauth.IdentityKeyInfo} */ (
-    jspb.Message.getWrapperField(this, identity_unauth_pb.IdentityKeyInfo, 3));
-};
-
-
-/**
- * @param {?proto.identity.unauth.IdentityKeyInfo|undefined} value
- * @return {!proto.identity.auth.KeyserverKeysResponse} returns this
-*/
-proto.identity.auth.KeyserverKeysResponse.prototype.setPrimaryDeviceIdentityInfo = function(value) {
-  return jspb.Message.setWrapperField(this, 3, value);
-};
-
-
-/**
- * Clears the message field making it undefined.
- * @return {!proto.identity.auth.KeyserverKeysResponse} returns this
- */
-proto.identity.auth.KeyserverKeysResponse.prototype.clearPrimaryDeviceIdentityInfo = function() {
-  return this.setPrimaryDeviceIdentityInfo(undefined);
-};
-
-
-/**
- * Returns whether this field is set.
- * @return {boolean}
- */
-proto.identity.auth.KeyserverKeysResponse.prototype.hasPrimaryDeviceIdentityInfo = function() {
-  return jspb.Message.getField(this, 3) != null;
-};
-
-
 
 
 
diff --git a/web/protobufs/identity-auth-structs.cjs.flow b/web/protobufs/identity-auth-structs.cjs.flow
--- a/web/protobufs/identity-auth-structs.cjs.flow
+++ b/web/protobufs/identity-auth-structs.cjs.flow
@@ -162,11 +162,6 @@
   hasIdentity(): boolean;
   clearIdentity(): KeyserverKeysResponse;
 
-  getPrimaryDeviceIdentityInfo(): identityStructs.IdentityKeyInfo | void;
-  setPrimaryDeviceIdentityInfo(value?: identityStructs.IdentityKeyInfo): KeyserverKeysResponse;
-  hasPrimaryDeviceIdentityInfo(): boolean;
-  clearPrimaryDeviceIdentityInfo(): KeyserverKeysResponse;
-
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): KeyserverKeysResponseObject;
   static toObject(includeInstance: boolean, msg: KeyserverKeysResponse): KeyserverKeysResponseObject;
@@ -178,7 +173,6 @@
 export type KeyserverKeysResponseObject = {
   keyserverInfo: ?OutboundKeyInfoObject,
   identity: ?IdentityObject,
-  primaryDeviceIdentityInfo: ?identityStructs.IdentityKeyInfoObject,
 };
 
 declare export class OutboundKeysForUserResponse extends Message {