diff --git a/src/include/libpq/libpq-be-fe-helpers.h b/src/include/libpq/libpq-be-fe-helpers.h
index cff68cd1c37..b0949280ce0 100644
--- a/src/include/libpq/libpq-be-fe-helpers.h
+++ b/src/include/libpq/libpq-be-fe-helpers.h
@@ -498,8 +498,15 @@ libpqsrv_notice_receiver(void *arg, const PGresult *res)
 	if (len > 0 && message[len - 1] == '\n')
 		len--;
 
+	/*
+	 * Omit the local statement and context from each remote message. They can
+	 * help identify the caller, but repeating them for every message could
+	 * greatly increase log volume.
+	 */
 	ereport(LOG,
-			errmsg_internal("%s: %.*s", prefix, len, message));
+			errmsg_internal("%s: %.*s", prefix, len, message),
+			errhidestmt(true),
+			errhidecontext(true));
 }
 
 #define PGresult libpqsrv_PGresult