diff --git a/pkg/vm_service/CHANGELOG.md b/pkg/vm_service/CHANGELOG.md
index d5bb0fd..a77a155 100644
--- a/pkg/vm_service/CHANGELOG.md
+++ b/pkg/vm_service/CHANGELOG.md
@@ -1,6 +1,8 @@
 ## 15.1.0
 - Update to version `4.20` of the spec.
 - Deprecate `streamCpuSamplesWithUserTag` RPC.
+- Fix bug where `RPCError` exceptions thrown by service callbacks were incorrectly
+  wrapped as `kServerError`, losing the original error code.
 
 ## 15.0.2
 - Add `kTimerSignificantlyOverdue` field to `EventKind`.
diff --git a/pkg/vm_service/lib/src/vm_service.dart b/pkg/vm_service/lib/src/vm_service.dart
index 1705bbc..10677dc 100644
--- a/pkg/vm_service/lib/src/vm_service.dart
+++ b/pkg/vm_service/lib/src/vm_service.dart
@@ -2095,7 +2095,11 @@
 
     try {
       return await service(params);
+    } on RPCError catch (e) {
+      // Preserve RPCError exceptions as-is.
+      return {'error': e.toMap()};
     } catch (e, st) {
+      // Wrap other exceptions.
       final error = RPCError.withDetails(
         method,
         RPCErrorKind.kServerError.code,