diff --git a/views/_partial/noscript-refresh.njk b/views/_partial/noscript-refresh.njk
index 10dd7df..07ddf78 100644
--- a/views/_partial/noscript-refresh.njk
+++ b/views/_partial/noscript-refresh.njk
@@ -5,7 +5,7 @@
 #}
 <noscript>
   <style>body > section:not(#noscript) { display: none !important; }</style>
-  {% if noscriptRefreshUrl !== null -%}
+  {% if config.routes.nojs or noscriptRefreshUrl -%}
   <!-- Redirect after 3 seconds -->
   <meta http-equiv="refresh" content="3;url={{ noscriptRefreshUrl or 'nojs' }}">
   {%- endif %}
diff --git a/views/_partial/noscript.njk b/views/_partial/noscript.njk
index da213b7..f82e563 100644
--- a/views/_partial/noscript.njk
+++ b/views/_partial/noscript.njk
@@ -7,7 +7,7 @@
         </p>
         {% if noscriptMessage or (noscriptMessage === null) -%}
         {{ noscriptMessage | safe }}
-        {%- else -%}
+        {%- elif config.routes.nojs -%}
         <p>If you are not automatically redirected to our No-JS uploader, <a href="nojs">click here</a>.</p>
         {%- endif %}
       </div>