diff --git a/src/invidious/helpers/companion_status.cr b/src/invidious/helpers/companion_status.cr
index 2f92cac6..50eccffb 100644
--- a/src/invidious/helpers/companion_status.cr
+++ b/src/invidious/helpers/companion_status.cr
@@ -115,7 +115,8 @@ class CompanionStatus
   end
 
   private def healthcheck(companion : Config::CompanionConfig, index : Int32)
-    client = HTTP::Client.new(companion.private_url, tls: @tlscontext)
+    tls = @tlscontext if companion.private_url.scheme == "https"
+    client = HTTP::Client.new(companion.private_url, tls: tls)
     client.connect_timeout = 10.seconds
 
     response = client.get(CONFIG.check_backends_path)
diff --git a/src/invidious/routes/before_all.cr b/src/invidious/routes/before_all.cr
index 297b7ce0..0c5410ce 100644
--- a/src/invidious/routes/before_all.cr
+++ b/src/invidious/routes/before_all.cr
@@ -260,10 +260,18 @@ module Invidious::Routes::BeforeAll::Companion
       working_companions = working_companions.community
     end
 
+    if !current_companion.nil?
+      if working_companions.empty?
+        current_companion = self.wrap_current_companion(env, host, current_companion, c_size, working_companions, preferences)
+        return current_companion
+      end
+    end
+
     if current_companion.nil?
       available_companion = self.get_available_companion(c_size, working_companions)
       if available_companion
         current_companion = available_companion
+        current_companion = self.wrap_current_companion(env, host, current_companion, c_size, working_companions, preferences)
         return current_companion
       else
         return nil