diff --git a/plinth/modules/diagnostics/templates/diagnostics.html b/plinth/modules/diagnostics/templates/diagnostics.html
index 797d1356f..f8f45f94a 100644
--- a/plinth/modules/diagnostics/templates/diagnostics.html
+++ b/plinth/modules/diagnostics/templates/diagnostics.html
@@ -81,6 +81,7 @@
 {% block page_js %}
   {% if is_running %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    <script type="text/javascript">refresh();</script>
   {% endif %}
 {% endblock %}
 
diff --git a/plinth/modules/monkeysphere/templates/monkeysphere.html b/plinth/modules/monkeysphere/templates/monkeysphere.html
index f33442fdd..2a9aa2378 100644
--- a/plinth/modules/monkeysphere/templates/monkeysphere.html
+++ b/plinth/modules/monkeysphere/templates/monkeysphere.html
@@ -173,6 +173,7 @@
 {% block page_js %}
   {% if running %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    <script type="text/javascript">refresh();</script>
   {% endif %}
 {% endblock %}
 
diff --git a/plinth/modules/openvpn/templates/openvpn.html b/plinth/modules/openvpn/templates/openvpn.html
index 6d37f07e7..6ac6d0c90 100644
--- a/plinth/modules/openvpn/templates/openvpn.html
+++ b/plinth/modules/openvpn/templates/openvpn.html
@@ -133,5 +133,6 @@
 {% block page_js %}
   {% if status.setup_running %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    <script type="text/javascript">refresh();</script>
   {% endif %}
 {% endblock %}
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 2a168a64d..74ca11668 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -173,6 +173,7 @@
 
   {% if config_running %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    <script type="text/javascript">refresh();</script>
   {% endif %}
 
 {% endblock %}
diff --git a/plinth/modules/upgrades/templates/upgrades.html b/plinth/modules/upgrades/templates/upgrades.html
index 067176c06..1c6e035a5 100644
--- a/plinth/modules/upgrades/templates/upgrades.html
+++ b/plinth/modules/upgrades/templates/upgrades.html
@@ -88,5 +88,6 @@
 
   {% if is_busy %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    <script type="text/javascript">refresh();</script>
   {% endif %}
 {% endblock %}
diff --git a/plinth/templates/setup.html b/plinth/templates/setup.html
index d7a96b060..94bfb2f01 100644
--- a/plinth/templates/setup.html
+++ b/plinth/templates/setup.html
@@ -23,7 +23,11 @@
 {% load static %}
 
 {% block page_head %}
-  {% if setup_current_operation or setup_state == 'up-to-date' %}
+  {% if setup_state == 'up-to-date' %}
+    <noscript>
+      <meta http-equiv="refresh" content="0" />
+    </noscript>
+  {% elif setup_current_operation %}
     <noscript>
       <meta http-equiv="refresh" content="3" />
     </noscript>
@@ -140,6 +144,11 @@
 
   {% if setup_current_operation or setup_state == 'up-to-date' %}
     <script type="text/javascript" src="{% static 'theme/js/refresh.js' %}"></script>
+    {% if setup_state == 'up-to-date' %}
+      <script type="text/javascript">refresh(0);</script>
+    {% else %}
+      <script type="text/javascript">refresh();</script>
+    {% endif %}
   {% endif %}
 
 {% endblock %}
diff --git a/static/themes/default/js/refresh.js b/static/themes/default/js/refresh.js
index 891d9abdb..12ab9fdac 100644
--- a/static/themes/default/js/refresh.js
+++ b/static/themes/default/js/refresh.js
@@ -21,9 +21,9 @@ function sleep(ms) {
 
 // Refresh the page once in n seconds
 async function refresh(ms) {
+    if (typeof ms === 'undefined')
+        ms = 3000;
+
     await sleep(ms);
     window.location.reload();
 }
-
-refresh(3000);
-