diff --git a/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java b/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java
index 6c739f1..fbe5d1c 100644
--- a/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java
+++ b/api/src/main/java/com/alttd/chat/objects/chat_log/ChatLog.java
@@ -12,6 +12,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.time.Instant;
+import java.time.ZoneOffset;
 import java.util.UUID;
 
 @AllArgsConstructor
@@ -49,7 +50,7 @@ public class ChatLog implements BatchInsertable {
         chatMessageDto.setMessage(GsonComponentSerializer.gson().serialize(miniMessage));
         chatMessageDto.setChannel(ChatMessageDto.ChannelEnum.CHAT);
         chatMessageDto.setServer(server);
-        chatMessageDto.setTimestamp(timestamp);
+        chatMessageDto.setTimestamp(timestamp.atOffset(ZoneOffset.UTC));
         chatMessageDto.setUuid(uuid);
         chatMessageDto.setBlocked(blocked);
         return chatMessageDto;
diff --git a/web-api/build.gradle.kts b/web-api/build.gradle.kts
index e6c5707..3e5e0cb 100644
--- a/web-api/build.gradle.kts
+++ b/web-api/build.gradle.kts
@@ -45,9 +45,6 @@ tasks.named<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openAp
         )
     )
 
-    typeMappings.set(mapOf("OffsetDateTime" to "Instant"))
-    importMappings.set(mapOf("OffsetDateTime" to "java.time.Instant"))
-
     generateApiTests.set(false)
     generateApiDocumentation.set(false)
     generateModelTests.set(false)