diff --git a/CHANGELOG.md b/CHANGELOG.md
index a08e611ce..6bb7c785b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -113,6 +113,7 @@ Please read the [UPGRADE.md](https://framagit.org/framasoft/mobilizon/-/blob/mai
 - Fixed padding below truncated title of event cards
 - Fixed exports that weren't enabled in Docker
 - Fixed error page when event end date is null
+- Fixed event language not being allowed to be null
 
 ### Security
 
diff --git a/lib/graphql/schema/discussions/comment.ex b/lib/graphql/schema/discussions/comment.ex
index 21c664c03..d8384e4ad 100644
--- a/lib/graphql/schema/discussions/comment.ex
+++ b/lib/graphql/schema/discussions/comment.ex
@@ -55,7 +55,7 @@ defmodule Mobilizon.GraphQL.Schema.Discussions.CommentType do
       description: "Whether this comment needs to be announced to participants"
     )
 
-    field(:language, non_null(:string), description: "The comment language")
+    field(:language, :string, description: "The comment language")
   end
 
   @desc "The list of visibility options for a comment"
diff --git a/lib/graphql/schema/event.ex b/lib/graphql/schema/event.ex
index 4f2599668..503c6e7e9 100644
--- a/lib/graphql/schema/event.ex
+++ b/lib/graphql/schema/event.ex
@@ -104,7 +104,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
     field(:inserted_at, :datetime, description: "When the event was created")
     field(:options, :event_options, description: "The event options")
     field(:metadata, list_of(:event_metadata), description: "A key-value list of metadata")
-    field(:language, non_null(:string), description: "The event language")
+    field(:language, :string, description: "The event language")
   end
 
   @desc "The list of visibility options for an event"
diff --git a/lib/graphql/schema/post.ex b/lib/graphql/schema/post.ex
index 6f65c5de3..a354843b6 100644
--- a/lib/graphql/schema/post.ex
+++ b/lib/graphql/schema/post.ex
@@ -20,7 +20,7 @@ defmodule Mobilizon.GraphQL.Schema.PostType do
     field(:publish_at, :datetime, description: "When the post was published")
     field(:inserted_at, :datetime, description: "The post's creation date")
     field(:updated_at, :datetime, description: "The post's last update date")
-    field(:language, non_null(:string), description: "The post language")
+    field(:language, :string, description: "The post language")
 
     field(:tags, list_of(:tag),
       resolve: &Tag.list_tags_for_post/3,