diff --git a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
index 705e82e30..d50813017 100644
--- a/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
+++ b/security/tor/src/opnsense/mvc/app/controllers/OPNsense/Tor/IndexController.php
@@ -31,6 +31,8 @@
 
 namespace OPNsense\Tor;
 
+use OPNsense\Tor\General;
+
 /**
 * Class IndexController
 * @package OPNsense/Tor
@@ -57,8 +59,9 @@ class IndexController extends \OPNsense\Base\IndexController
     }
     public function diagnosticsAction()
     {
+        $general = new General();
         $this->view->title = gettext("The Onion Router - Diagnostics");
-        if ($this->is_tor_running()) {
+        if ($this->is_tor_running() && (int)((string)$general->control_port) > 0) {
             $this->view->pick('OPNsense/Tor/diagnostics');
         }
         else {
diff --git a/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/error.volt b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/error.volt
index 71500976a..ae36b06c9 100644
--- a/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/error.volt
+++ b/security/tor/src/opnsense/mvc/app/views/OPNsense/Tor/error.volt
@@ -28,5 +28,5 @@
 #}
 
 <div class="alert alert-warning" role="alert">
-    {{ lang._('This page is not available because Tor is not running. Please go to the %sconfiguration page%s and enable Tor.')|format('<a href="/ui/tor/">','</a>') }}
+    {{ lang._('This page is not available because Tor is not running or the control socket is not configured. Please go to the %sconfiguration page%s and enable Tor.')|format('<a href="/ui/tor/">','</a>') }}
 </div>