diff --git a/include/grpc++/client_context.h b/include/grpc++/client_context.h
index f18fb61b4c3a39bd311b0aa546c155fa1ac8c60f..bb39042bcb82c6165da6f5da8ee851b92b97bfe2 100644
--- a/include/grpc++/client_context.h
+++ b/include/grpc++/client_context.h
@@ -118,6 +118,10 @@ class ClientContext {
 
   std::shared_ptr<const AuthContext> auth_context() const;
 
+  // Return the peer uri in a string.
+  // WARNING: this value is never authenticated or subject to any security
+  // related code. It must not be used for any authentication related
+  // functionality. Instead, use auth_context.
   grpc::string peer() const;
 
   // Get and set census context
diff --git a/include/grpc++/server_context.h b/include/grpc++/server_context.h
index 393822c4fd18f39100cbc1d38d76c3e94def3f90..1e848935a20b68bbad14260dddbeaf4169d9e8bb 100644
--- a/include/grpc++/server_context.h
+++ b/include/grpc++/server_context.h
@@ -116,6 +116,10 @@ class ServerContext {
 
   std::shared_ptr<const AuthContext> auth_context() const;
 
+  // Return the peer uri in a string.
+  // WARNING: this value is never authenticated or subject to any security
+  // related code. It must not be used for any authentication related
+  // functionality. Instead, use auth_context.
   grpc::string peer() const;
 
  private: