diff --git a/scripts/cloudron-support b/scripts/cloudron-support
index e67acbe50..f1db5772b 100755
--- a/scripts/cloudron-support
+++ b/scripts/cloudron-support
@@ -122,9 +122,13 @@ function send_diagnostics() {
     dashboard_domain=$(mysql -NB -uroot -ppassword -e "SELECT value FROM box.settings WHERE name='dashboard_domain'" 2>/dev/null || true)
     echo -e "Dashboard domain: ${dashboard_domain}" >> $log
 
-    echo -e $LINE"Docker containers"$LINE >> $log
+    echo -e $LINE"Docker"$LINE >> $log
+    if ! timeout --kill-after 10s 15s docker system info &>> $log 2>&1; then
+        echo -e "Docker (system info) is not responding" >> $log
+    fi
+
     if ! timeout --kill-after 10s 15s docker ps -a &>> $log 2>&1; then
-        echo -e "Docker is not responding" >> $log
+        echo -e "Docker (ps) is not responding" >> $log
     fi
 
     echo -e $LINE"Filesystem stats"$LINE >> $log