diff --git a/app.py b/app.py
index f1179304..c20948f9 100644
--- a/app.py
+++ b/app.py
@@ -36,7 +36,7 @@
 app.register_blueprint(amiibofullApp)
 
 CORS(app)
-app.json_encoder = AmiiboJSONEncoder
+app.json = AmiiboJSONEncoder(app)
 Compress(app)
 
 amiibo_manager = AmiiboManager.getInstance()
diff --git a/commons/amiibo_json_encounter.py b/commons/amiibo_json_encounter.py
index bd8b872a..03ea6bb0 100644
--- a/commons/amiibo_json_encounter.py
+++ b/commons/amiibo_json_encounter.py
@@ -1,6 +1,6 @@
 import datetime
 
-from flask.json import JSONEncoder
+from flask.json.provider import DefaultJSONProvider
 
 from amiibo.amiibo import (Amiibo,
                            AmiiboReleaseDates,
@@ -11,7 +11,7 @@
                            Hex)
 from amiibo.filterable import FilterableCollection
 
-class AmiiboJSONEncoder(JSONEncoder):
+class AmiiboJSONEncoder(DefaultJSONProvider):
     def default(self, obj):
         if isinstance(obj, Hex):
             return str(obj)