diff --git a/src/invidious/channels/channels.cr b/src/invidious/channels/channels.cr
index 65a1aab72..32116cbcd 100644
--- a/src/invidious/channels/channels.cr
+++ b/src/invidious/channels/channels.cr
@@ -107,7 +107,7 @@ class ChannelRedirect < Exception
 end
 
 def get_batch_channels(channels)
-  finished_channel = Channel(String | Nil).new
+  finished_channel = Channel(String?).new
   max_threads = 10
 
   spawn do
diff --git a/src/invidious/helpers/errors.cr b/src/invidious/helpers/errors.cr
index fa198031e..7ee5d30dd 100644
--- a/src/invidious/helpers/errors.cr
+++ b/src/invidious/helpers/errors.cr
@@ -139,7 +139,7 @@ def error_json_helper(
   env : HTTP::Server::Context,
   status_code : Int32,
   exception : Exception,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object)? = nil,
 )
   if exception.is_a?(InfoException)
     return error_json_helper(env, status_code, exception.message || "", additional_fields)
@@ -161,7 +161,7 @@ def error_json_helper(
   env : HTTP::Server::Context,
   status_code : Int32,
   message : String,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object)? = nil,
 )
   env.response.content_type = "application/json"
   env.response.status_code = status_code
diff --git a/src/invidious/helpers/i18n.cr b/src/invidious/helpers/i18n.cr
index bca2edda9..497501ce7 100644
--- a/src/invidious/helpers/i18n.cr
+++ b/src/invidious/helpers/i18n.cr
@@ -94,7 +94,7 @@ def load_all_locales
   return locales
 end
 
-def translate(locale : String?, key : String, text : String | Hash(String, String) | Nil = nil) : String
+def translate(locale : String?, key : String, text : String | Hash(String, String)? = nil) : String
   # Log a warning if "key" doesn't exist in en-US locale and return
   # that key as the text, so this is more or less transparent to the user.
   if !LOCALES["en-US"].has_key?(key)
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index b9ddecb6b..f23317b3f 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -48,7 +48,7 @@ struct Video
     end
   end
 
-  def to_json(json : JSON::Builder | Nil = nil)
+  def to_json(json : JSON::Builder? = nil)
     to_json(nil, json)
   end
 
diff --git a/src/invidious/yt_backend/youtube_api.cr b/src/invidious/yt_backend/youtube_api.cr
index dd709920a..6d6060ebf 100644
--- a/src/invidious/yt_backend/youtube_api.cr
+++ b/src/invidious/yt_backend/youtube_api.cr
@@ -207,7 +207,7 @@ module YoutubeAPI
 
     # Region to provide to youtube, e.g to alter search results
     # (this is passed as the `gl` parameter).
-    property region : String | Nil
+    property region : String?
 
     # Initialization function
     def initialize(
@@ -283,7 +283,7 @@ module YoutubeAPI
   # Return, as a Hash, the "context" data required to request the
   # youtube API endpoints.
   #
-  private def make_context(client_config : ClientConfig | Nil, video_id = "dQw4w9WgXcQ") : Hash
+  private def make_context(client_config : ClientConfig?, video_id = "dQw4w9WgXcQ") : Hash
     # Use the default client config if nil is passed
     client_config ||= DEFAULT_CLIENT_CONFIG
 
@@ -353,7 +353,7 @@ module YoutubeAPI
   #
   #  - A playlist ID (parameters MUST be an empty string)
   #
-  def browse(continuation : String, client_config : ClientConfig | Nil = nil)
+  def browse(continuation : String, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data = {
       "context"      => self.make_context(client_config),
@@ -368,7 +368,7 @@ module YoutubeAPI
     browse_id : String,
     *, # Force the following parameters to be passed by name
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   )
     # JSON Request data, required by the API
     data = {
@@ -421,7 +421,7 @@ module YoutubeAPI
   #    })
   #    ```
   #
-  def next(continuation : String, *, client_config : ClientConfig | Nil = nil)
+  def next(continuation : String, *, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data = {
       "context"      => self.make_context(client_config),
@@ -432,7 +432,7 @@ module YoutubeAPI
   end
 
   # :ditto:
-  def next(data : Hash, *, client_config : ClientConfig | Nil = nil)
+  def next(data : Hash, *, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data2 = data.merge({
       "context" => self.make_context(client_config),
@@ -442,7 +442,7 @@ module YoutubeAPI
   end
 
   # Allow a NamedTuple to be passed, too.
-  def next(data : NamedTuple, *, client_config : ClientConfig | Nil = nil)
+  def next(data : NamedTuple, *, client_config : ClientConfig? = nil)
     return self.next(data.to_h, client_config: client_config)
   end
 
@@ -495,7 +495,7 @@ module YoutubeAPI
   # channel_b = YoutubeAPI.resolve_url("https://youtube.com/c/invalid")
   # ```
   #
-  def resolve_url(url : String, client_config : ClientConfig | Nil = nil)
+  def resolve_url(url : String, client_config : ClientConfig? = nil)
     data = {
       "context" => self.make_context(nil),
       "url"     => url,
@@ -521,7 +521,7 @@ module YoutubeAPI
   def search(
     search_query : String,
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   )
     # JSON Request data, required by the API
     data = {
@@ -547,7 +547,7 @@ module YoutubeAPI
 
   def get_transcript(
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   ) : Hash(String, JSON::Any)
     data = {
       "context" => self.make_context(client_config),
@@ -569,7 +569,7 @@ module YoutubeAPI
   def _post_json(
     endpoint : String,
     data : Hash,
-    client_config : ClientConfig | Nil,
+    client_config : ClientConfig?,
   ) : Hash(String, JSON::Any)
     # Use the default client config if nil is passed
     client_config ||= DEFAULT_CLIENT_CONFIG