diff --git a/data/web/lang/lang.de-de.json b/data/web/lang/lang.de-de.json
index b6229491a..7b4b1f46f 100644
--- a/data/web/lang/lang.de-de.json
+++ b/data/web/lang/lang.de-de.json
@@ -488,6 +488,7 @@
         "chart_this_server": "Chart (dieser Server)",
         "containers_info": "Container-Information",
         "container_running": "Läuft",
+        "container_disabled": "Container gestoppt oder deaktiviert",
         "container_stopped": "Angehalten",
         "cores": "Kerne",
         "current_time": "Systemzeit",
diff --git a/data/web/lang/lang.en-gb.json b/data/web/lang/lang.en-gb.json
index ce6e2cf8e..00b14f07a 100644
--- a/data/web/lang/lang.en-gb.json
+++ b/data/web/lang/lang.en-gb.json
@@ -491,6 +491,7 @@
         "chart_this_server": "Chart (this server)",
         "containers_info": "Container information",
         "container_running": "Running",
+        "container_disabled": "Container stopped or disabled",
         "container_stopped": "Stopped",
         "cores": "Cores",
         "current_time": "System Time",
diff --git a/data/web/templates/debug.twig b/data/web/templates/debug.twig
index eb48d54e8..6c96de880 100644
--- a/data/web/templates/debug.twig
+++ b/data/web/templates/debug.twig
@@ -160,8 +160,14 @@
                   <div class="d-flex p-2 list-group-header">
                     <div>
                       <span class="fw-bold">solr-mailcow</span>
+                      {% if containers["solr-mailcow"].State.Running == 1 %}
                       <span class="d-block d-md-inline">({{ containers["solr-mailcow"].Config.Image }})</span>
+                      {% endif %}
+                      {% if containers["solr-mailcow"].State.Running == 1 %}
                       <small class="d-block">({{ lang.debug.started_on }} <span class="parse_date">{{ containers["solr-mailcow"].State.StartedAtHR }}</span>)</small>
+                      {% elseif containers["solr-mailcow"].State.Running != 1 %}
+                      <small class="d-block">{{ lang.debug.container_disabled }}</small>
+                      {% endif %}
                       {% if containers["solr-mailcow"].State.Running == 1 %}
                         <span class="badge fs-7 bg-success loader" style="min-width:100px">
                           {{ lang.debug.container_running }}
@@ -169,19 +175,22 @@
                           <span class="loader-dot">.</span>
                           <span class="loader-dot">.</span>
                         </span>
-                      {% elseif containers["solr-mailcow"].State %}
+                      {% elseif containers["solr-mailcow"].State.Running != 1 %}
                         <span class="badge fs-7 bg-danger" style="min-width:100px">
                           {{ lang.debug.container_stopped }}
                           <i class="bi-x ms-1"></i>
                         </span>
                       {% endif %}
                     </div>
+                  {% if containers["solr-mailcow"].State.Running == 1 %}
                     <div class="mt-auto ms-auto">
                       <button class="btn btn-light" type="button" data-bs-toggle="collapse" data-bs-target="#solr-mailcowCollapse" aria-expanded="false" aria-controls="solr-mailcowCollapse">
                         <i class="bi bi-caret-down-fill caret"></i>
                       </button>
                     </div>
+                  {% endif %}  
                   </div>
+                  {% if containers["solr-mailcow"].State.Running == 1 %}
                   <div class="collapse p-0 list-group-details container-details-collapse" id="solr-mailcowCollapse" data-id="{{ containers["solr-mailcow"].Id }}">    
                     <div class="row p-2 pt-4">
                       <div class="col-sm-3">
@@ -238,6 +247,7 @@
                       </div>
                     </div>                  
                   </div>
+                  {% endif %}
                 </div>
               </div>