diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.cr
index 5e788b23..ca7e26dc 100644
--- a/src/invidious/routes/before_all.cr
+++ b/src/invidious/routes/before_all.cr
@@ -61,8 +61,12 @@ module Invidious::Routes::BeforeAll
             end
           end
 
-          if current_companion > CONFIG.invidious_companion.size
-            current_companion = current_companion % CONFIG.invidious_companion.size - 1
+          if current_companion < 0
+            current_companion = rand(CONFIG.invidious_companion.size)
+          end
+
+          if current_companion >= CONFIG.invidious_companion.size
+            current_companion = current_companion % CONFIG.invidious_companion.size
             env.response.cookies[CONFIG.server_id_cookie_name] = Invidious::User::Cookies.server_id(host, current_companion)
           end