diff --git a/plinth/modules/openvpn/templates/openvpn.html b/plinth/modules/openvpn/templates/openvpn.html
index ac65c4ad9..f0b26979c 100644
--- a/plinth/modules/openvpn/templates/openvpn.html
+++ b/plinth/modules/openvpn/templates/openvpn.html
@@ -111,7 +111,7 @@
{% endif %}
- {% include "diagnostics_button.html" with module="openvpn" enabled=status.is_running %}
+ {% include "diagnostics_button.html" with module="openvpn" enabled=status.enabled %}
{% trans "Configuration" %}
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 5e66835f8..190468a8a 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -55,7 +55,7 @@
{% endif %}
- {% include "diagnostics_button.html" with module="tor" enabled=status.is_running %}
+ {% include "diagnostics_button.html" with module="tor" enabled=status.enabled %}
{% if status.hs_enabled %}
diff --git a/plinth/templates/service.html b/plinth/templates/service.html
index 0025d72c8..1cffd7c82 100644
--- a/plinth/templates/service.html
+++ b/plinth/templates/service.html
@@ -59,7 +59,7 @@
{% block diagnostics %}
{% if diagnostics_module_name %}
- {% include "diagnostics_button.html" with module=diagnostics_module_name enabled=service.is_running %}
+ {% include "diagnostics_button.html" with module=diagnostics_module_name enabled=service.is_enabled %}
{% endif %}
{% endblock %}