diff --git a/alpine/packages/diagnostics/diagnostics b/alpine/packages/diagnostics/diagnostics
index b81f24733..4b0598e06 100755
--- a/alpine/packages/diagnostics/diagnostics
+++ b/alpine/packages/diagnostics/diagnostics
@@ -22,5 +22,7 @@ DOCKER=$(ps -eo args | grep '^/usr/bin/docker')
 [ $? -eq 0 ] && printf "✓ Process docker running: $DOCKER\n" || printf "✗ No docker process\n"
 DOCKERPS=$(docker ps 2>&1)
 [ $? -eq 0 ] && printf "✓ Docker daemon working\n" || printf "✗ Docker ps failed: $DOCKERPS\n"
+DIAGNOSTICS=$(ps -eo args | grep '/usr/bin/diagnostics-server$')
+[ $? -eq 0 ] && printf "✓ Diagnostics server running: $DIAGNOSTICS\n" || printf "✗ No diagnostics server\n"
 
 exit 0
diff --git a/alpine/packages/diagnostics/etc/init.d/diagnostics b/alpine/packages/diagnostics/etc/init.d/diagnostics
index a5cbf056a..4543a96d3 100755
--- a/alpine/packages/diagnostics/etc/init.d/diagnostics
+++ b/alpine/packages/diagnostics/etc/init.d/diagnostics
@@ -9,6 +9,6 @@ start()
 {
 	ebegin "Checking system state"
 
-	/usr/bin/diagnostics
 	/usr/bin/diagnostics-server &
+	/usr/bin/diagnostics
 }