diff --git a/errors/errors.go b/errors/errors.go
index 961aec399..0d17ba5fb 100644
--- a/errors/errors.go
+++ b/errors/errors.go
@@ -725,7 +725,11 @@ func PublicError(err error) *Error {
 	}
 }
 
-// WrapGRPCPublic wraps an error for gRPC without exposing internal details.
+// WrapGRPCPublic wraps an error for gRPC without exposing internal structured details.
+// It includes a sanitized TError detail (code + message only) so that UnwrapGRPC
+// can reconstruct the correct application error code on the client side.
+// Structured metadata such as file paths, line numbers, function names, wrapped error
+// chains, and error data is omitted; the error message itself is preserved (UTF-8 sanitized).
 func WrapGRPCPublic(err error) error {
 	if err == nil {
 		return nil
@@ -736,7 +740,24 @@ func WrapGRPCPublic(err error) error {
 		return nil
 	}
 
-	st := status.New(ErrorCodeToGRPCCode(publicErr.code), publicErr.message)
+	// Sanitize message for valid UTF-8 to prevent gRPC/protobuf marshaling failures
+	sanitizedMsg := RemoveInvalidUTF8(publicErr.message)
+
+	st := status.New(ErrorCodeToGRPCCode(publicErr.code), sanitizedMsg)
+
+	// Attach a sanitized TError detail so clients can recover the application error code.
+	// After UTF-8 sanitization this cannot practically fail, but if it does we fall
+	// through and return the bare status (same as pre-fix behavior).
+	detail, pbErr := anypb.New(&TError{
+		Code:    publicErr.code,
+		Message: sanitizedMsg,
+	})
+	if pbErr == nil {
+		if newSt, detailsErr := st.WithDetails(detail); detailsErr == nil {
+			st = newSt
+		}
+	}
+
 	return st.Err()
 }
 
diff --git a/errors/errors_test.go b/errors/errors_test.go
index a721bcb51..8a38308af 100644
--- a/errors/errors_test.go
+++ b/errors/errors_test.go
@@ -2215,7 +2215,7 @@ func TestWrapGRPCPublic(t *testing.T) {
 		require.Nil(t, result)
 	})
 
-	t.Run("returns gRPC status error without internal details", func(t *testing.T) {
+	t.Run("returns gRPC status error with sanitized detail", func(t *testing.T) {
 		innerErr := New(ERR_STORAGE_ERROR, "internal db error")
 		outerErr := New(ERR_SERVICE_ERROR, "service unavailable", innerErr)
 
@@ -2233,8 +2233,19 @@ func TestWrapGRPCPublic(t *testing.T) {
 		// Message should be the top-level message only
 		require.Equal(t, "service unavailable", st.Message())
 
-		// Should not have detailed error information in status details
-		require.Empty(t, st.Details())
+		// Should have exactly one sanitized TError detail (code + message only)
+		require.Len(t, st.Details(), 1)
+
+		// Verify the detail contains only code and message, no internal info
+		unwrapped := UnwrapGRPC(result)
+		require.NotNil(t, unwrapped)
+		require.Equal(t, ERR_SERVICE_ERROR, unwrapped.code)
+		require.Equal(t, "service unavailable", unwrapped.message)
+		require.Empty(t, unwrapped.file)
+		require.Zero(t, unwrapped.line)
+		require.Empty(t, unwrapped.function)
+		require.Nil(t, unwrapped.wrappedErr)
+		require.Nil(t, unwrapped.data)
 	})
 
 	t.Run("maps error codes to gRPC codes correctly", func(t *testing.T) {
@@ -2297,6 +2308,66 @@ func TestWrapGRPCPublic(t *testing.T) {
 		require.NotContains(t, errStr, "secret123")
 		require.NotContains(t, errStr, "admin")
 	})
+
+	t.Run("preserves error code through WrapGRPCPublic and UnwrapGRPC round-trip", func(t *testing.T) {
+		// This test verifies that clients (e.g. tx-blaster) can detect specific error
+		// types after WrapGRPCPublic sanitization via errors.Is() code matching.
+		tests := []struct {
+			name     string
+			err      *Error
+			sentinel *Error
+		}{
+			{"TX_LOCKED", NewTxLockedError("transaction is locked"), ErrTxLocked},
+			{"TX_EXISTS", NewTxExistsError("tx already exists"), ErrTxExists},
+			{"TX_INVALID", NewTxInvalidError("invalid transaction"), ErrTxInvalid},
+			{"SERVICE_ERROR", NewServiceError("service unavailable"), ErrServiceError},
+			{"NOT_FOUND", New(ERR_NOT_FOUND, "resource not found"), ErrNotFound},
+			{"PROCESSING", NewProcessingError("processing failed"), ErrProcessing},
+		}
+
+		for _, tc := range tests {
+			t.Run(tc.name, func(t *testing.T) {
+				// Simulate server-side: wrap with WrapGRPCPublic
+				grpcErr := WrapGRPCPublic(tc.err)
+				require.NotNil(t, grpcErr)
+
+				// Simulate client-side: the package-level Is() handles gRPC-wrapped errors
+				// by calling UnwrapGRPC internally before comparing error codes
+				require.True(t, Is(grpcErr, tc.sentinel),
+					"Is(grpcErr, sentinel) should match %s after WrapGRPCPublic, got %v",
+					tc.sentinel.code.String(), grpcErr)
+
+				// Also verify direct UnwrapGRPC + Is works (what propagation.Client does)
+				unwrapped := UnwrapGRPC(grpcErr)
+				require.NotNil(t, unwrapped)
+				require.True(t, Is(unwrapped, tc.sentinel),
+					"Is(unwrapped, sentinel) should match %s after UnwrapGRPC, got code %s",
+					tc.sentinel.code.String(), unwrapped.code.String())
+			})
+		}
+	})
+
+	t.Run("does not expose wrapped error chain through round-trip", func(t *testing.T) {
+		// A nested error chain should not survive the sanitization
+		deepErr := New(ERR_STORAGE_ERROR, "secret database connection string")
+		midErr := New(ERR_SERVICE_ERROR, "internal path /var/secrets", deepErr)
+		topErr := New(ERR_PROCESSING, "processing failed", midErr)
+
+		grpcErr := WrapGRPCPublic(topErr)
+		unwrapped := UnwrapGRPC(grpcErr)
+
+		// Should have the top-level code and message
+		require.Equal(t, ERR_PROCESSING, unwrapped.code)
+		require.Equal(t, "processing failed", unwrapped.message)
+
+		// Should not have any wrapped error chain
+		require.Nil(t, unwrapped.wrappedErr)
+
+		// Should not leak internal details in the error string
+		errStr := unwrapped.Error()
+		require.NotContains(t, errStr, "secret database")
+		require.NotContains(t, errStr, "/var/secrets")
+	})
 }
 
 // TestWrapPublic tests the WrapPublic function for proper TError creation without internal details.