diff --git a/contrib/ruby_event_store-rom/Gemfile b/contrib/ruby_event_store-rom/Gemfile
index 2cb83432d1..51e27777de 100644
--- a/contrib/ruby_event_store-rom/Gemfile
+++ b/contrib/ruby_event_store-rom/Gemfile
@@ -7,4 +7,7 @@ gem "mysql2", ">= 0.5.3"
 gem "pg", ">= 1.2.2"
 gem "ruby_event_store", path: "../../ruby_event_store"
 gem "sqlite3", "1.4.2"
-gem "activesupport"
\ No newline at end of file
+
+group :test do
+  gem "activesupport"
+end
diff --git a/contrib/ruby_event_store-rom/lib/ruby_event_store/rom/changesets/create_events.rb b/contrib/ruby_event_store-rom/lib/ruby_event_store/rom/changesets/create_events.rb
index 929041fda2..838b43c8b4 100644
--- a/contrib/ruby_event_store-rom/lib/ruby_event_store/rom/changesets/create_events.rb
+++ b/contrib/ruby_event_store-rom/lib/ruby_event_store/rom/changesets/create_events.rb
@@ -11,6 +11,8 @@ class CreateEvents < ::ROM::Changeset::Create
           rename_keys timestamp: :created_at
           map_value   :created_at, ->(time) { Time.iso8601(time).localtime }
           map_value   :valid_at,   ->(time) { Time.iso8601(time).localtime }
+          map_value   :data, ->(value) { value.class.name == "Hash" ? value.to_json : value }
+          map_value   :metadata, ->(value) { value.class.name == "Hash" ? value.to_json : value }
           accept_keys %i[event_id data metadata event_type created_at valid_at]
         end