diff --git a/src/client_server.rs b/src/client_server.rs
index d1addc89..c5bba03d 100644
--- a/src/client_server.rs
+++ b/src/client_server.rs
@@ -67,11 +67,12 @@ use ruma::{
         unversioned::get_supported_versions,
     },
     events::{
+        custom::CustomEventContent,
         room::{
             canonical_alias, guest_access, history_visibility, join_rules, member, name, redaction,
             topic,
         },
-        AnyEphemeralRoomEvent, AnyEvent, AnySyncEphemeralRoomEvent, EventType,
+        AnyEphemeralRoomEvent, AnyEvent, AnySyncEphemeralRoomEvent, BasicEvent, EventType,
     },
     Raw, RoomAliasId, RoomId, RoomVersionId, UserId,
 };
@@ -601,8 +602,13 @@ pub fn set_global_account_data_route(
     db.account_data.update(
         None,
         user_id,
-        EventType::Custom(event_type),
-        &content,
+        event_type.clone().into(),
+        &BasicEvent {
+            content: CustomEventContent {
+                event_type,
+                json: content,
+            },
+        },
         &db.globals,
     )?;