diff --git a/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java b/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
index cac90ba46705..c50b358f68f4 100644
--- a/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
+++ b/solr/solrj-jetty/src/java/org/apache/solr/client/solrj/jetty/HttpJettySolrClient.java
@@ -50,6 +50,7 @@
 import org.apache.solr.client.solrj.request.RequestWriter;
 import org.apache.solr.client.solrj.response.ResponseParser;
 import org.apache.solr.client.solrj.util.ClientUtils;
+import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.util.EnvUtils;
@@ -627,6 +628,11 @@ protected void decorateRequest(Request req, SolrRequest<?> solrRequest, boolean
       req.onComplete(asyncTracker.completeListener);
     }
 
+    solrRequest.addHeader(
+        CommonParams.SOLR_REQUEST_TYPE_PARAM, solrRequest.getRequestType().toString());
+    solrRequest.addHeader(
+        CommonParams.SOLR_REQUEST_CONTEXT_PARAM, SolrRequest.SolrClientContext.CLIENT.toString());
+
     Map<String, String> headers = solrRequest.getHeaders();
     if (headers != null) {
       req.headers(h -> headers.forEach(h::add));
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
index 53b538c56f41..f0e56d1c2c89 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpJdkSolrClient.java
@@ -56,6 +56,7 @@
 import org.apache.solr.client.solrj.response.ResponseParser;
 import org.apache.solr.client.solrj.util.ClientUtils;
 import org.apache.solr.common.SolrException;
+import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.apache.solr.common.util.ContentStream;
 import org.apache.solr.common.util.ExecutorUtil;
@@ -271,6 +272,8 @@ private PreparedRequest prepareGet(
       throws IOException, URISyntaxException {
     validateGetRequest(solrRequest);
     reqb.GET();
+    reqb.header(CommonParams.SOLR_REQUEST_TYPE_PARAM, solrRequest.getRequestType().toString());
+    reqb.header(CommonParams.SOLR_REQUEST_CONTEXT_PARAM,  SolrRequest.SolrClientContext.CLIENT.toString());
     decorateRequest(reqb, solrRequest);
     reqb.uri(new URI(url + queryParams.toQueryString()));
     return new PreparedRequest(reqb, null);