diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb335ac..2847b16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 #### Fixes
 
 * Your contribution here.
-
+* [#402](https://github.com/ruby-grape/grape-entity/pull/402): Remove `Json::ParseError` assignment - [@olivier-thatch](https://github.com/olivier-thatch).
 
 ### 1.0.3 (2026-04-15)
 
diff --git a/lib/grape_entity/json.rb b/lib/grape_entity/json.rb
index c4f8907..a57278f 100644
--- a/lib/grape_entity/json.rb
+++ b/lib/grape_entity/json.rb
@@ -2,11 +2,6 @@
 
 module Grape
   class Entity
-    if defined?(::MultiJson)
-      Json = ::MultiJson
-    else
-      Json = ::JSON
-      Json::ParseError = Json::ParserError
-    end
+    Json = defined?(::MultiJson) ? ::MultiJson : ::JSON
   end
 end