diff --git a/src/invidious.cr b/src/invidious.cr
index 70c4a3f0e..9936bd394 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -343,7 +343,10 @@ if Kemal.config.ssl && redirect
   spawn do
     server = HTTP::Server.new("0.0.0.0", 80) do |context|
       context.response.headers.add "Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload"
-      redirect_url = "https://#{context.request.host}#{context.request.path}?#{context.request.query}"
+      redirect_url = "https://#{context.request.host}#{context.request.path}"
+      if context.request.query
+        redirect_url += "?#{context.request.query}"
+      end
       context.response.headers.add "Location", redirect_url
       context.response.status_code = 301
     end