diff --git a/src/invidious/helpers/crystal_class_overrides.cr b/src/invidious/helpers/crystal_class_overrides.cr
index fec3f62c..72a17255 100644
--- a/src/invidious/helpers/crystal_class_overrides.cr
+++ b/src/invidious/helpers/crystal_class_overrides.cr
@@ -5,7 +5,8 @@
 class TCPSocket
   def initialize(host, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
     Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
-      super(addrinfo.family, addrinfo.type, addrinfo.protocol, blocking)
+      super(addrinfo.family, addrinfo.type, addrinfo.protocol)
+      Socket.set_blocking(self.fd, blocking)
       connect(addrinfo, timeout: connect_timeout) do |error|
         close
         error
diff --git a/src/invidious/helpers/sig_helper.cr b/src/invidious/helpers/sig_helper.cr
index 6d198a42..e6f09a72 100644
--- a/src/invidious/helpers/sig_helper.cr
+++ b/src/invidious/helpers/sig_helper.cr
@@ -316,7 +316,7 @@ module Invidious::SigHelper
       {% end %}
 
       @socket.sync = false
-      @socket.blocking = false
+      Socket.set_blocking(@socket.fd, false)
     end
 
     def closed? : Bool