diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
index 789a4abeabac..76342dd124aa 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
@@ -41,6 +41,18 @@ protected Builder(ApiKeys api, short version, int controllerId, int controllerEp
             this.brokerEpoch = brokerEpoch;
             this.kraftController = kraftController;
         }
+
+        public int controllerId() {
+            return controllerId;
+        }
+
+        public int controllerEpoch() {
+            return controllerEpoch;
+        }
+
+        public long brokerEpoch() {
+            return brokerEpoch;
+        }
     }
 
     protected AbstractControlRequest(ApiKeys api, short version) {
diff --git a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
index 44002958a812..7e3b2a29227e 100755
--- a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
+++ b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
@@ -91,7 +91,9 @@ class ControllerChannelManager(controllerEpoch: () => Int,
         case Some(stateInfo) =>
           stateInfo.messageQueue.put(QueueItem(request.apiKey, request, callback, time.milliseconds()))
         case None =>
-          warn(s"Not sending request $request to broker $brokerId, since it is offline.")
+          warn(s"Not sending request ${request.apiKey.name} with controllerId=${request.controllerId()}, " +
+            s"controllerEpoch=${request.controllerEpoch()}, brokerEpoch=${request.brokerEpoch()} " +
+            s"to broker $brokerId, since it is offline.")
       }
     }
   }