diff --git a/CHANGELOG.md b/CHANGELOG.md
index 71b2aed..0502e60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # TBA
 
 - No longer use "" as the default master account because blockchain.info doesn't like it. Use "master" instead
+- Add fix for issue with AMS [not serializing in controllers](https://github.com/rails-api/active_model_serializers/issues/600)
 
 # 0.0.6
 
diff --git a/app/controllers/bitsy/application_controller.rb b/app/controllers/bitsy/application_controller.rb
index 5c23504..68fbcac 100644
--- a/app/controllers/bitsy/application_controller.rb
+++ b/app/controllers/bitsy/application_controller.rb
@@ -1,4 +1,7 @@
 module Bitsy
   class ApplicationController < ActionController::API
+    # TODO: Remove this when bug is fixed
+    # https://github.com/rails-api/active_model_serializers/issues/600
+    include ActionController::Serialization
   end
 end