diff --git a/layout/theme.liquid b/layout/theme.liquid
index ef692b5..472a662 100644
--- a/layout/theme.liquid
+++ b/layout/theme.liquid
@@ -151,7 +151,12 @@
       - The template is defined (will be undefined for app proxies like /apps|a|community|tools/*)
       - The current template is not the login page, unless multipass login is enabled
     {% endcomment %}
-    {%- assign should_redirect = template != blank and template.name != 'login' or settings.multipass_login -%}
+    {%- liquid
+       assign should_redirect = false
+       if settings.multipass_login or template != blank and template.name != 'login'
+         assign should_redirect = true
+       endif
+    -%}
 
     {%- if settings.storefront_hostname != blank and should_redirect -%}
     <script>
@@ -181,12 +186,12 @@
           var customRedirectsStr = "{{ settings.custom_redirects | newline_to_br | strip_newlines | replace: ' ', '' }}";
           if (customRedirectsStr) {
             var customRedirects = customRedirectsStr.split('<br/>');
-  
+
             for (var cri = 0; cri < customRedirects.length; cri += 1) {
               var redirect = customRedirects[cri].split('>');
               var fromPath = redirect[0];
               var toPath = redirect[1];
-  
+
               if (fromPath && toPath && redirectUrl.startsWith('https://' + storefrontHostname + fromPath)) {
                 redirectUrl = redirectUrl.replace(storefrontHostname + fromPath, storefrontHostname + toPath);
                 break;
@@ -196,7 +201,7 @@
 
           redirectUrl = new URL(redirectUrl);
 
-          {% comment %} 
+          {% comment %}
             Handle discount code logic (e.g. xxx.myshopify.com/discount/freeshipping?redirect=/products)
             - Add discount code to as param to the edirect URL if the `discount_code` cookie exists
             - Cookie is deleted after to prevent it from being automatically added to other routes