diff --git a/src/haproxy.c b/src/haproxy.c
index 14140a9ad..d11ef021e 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -2380,6 +2380,10 @@ static void init(int argc, char **argv)
 	if (global.mode & MODE_DUMP_KWD)
 		dump_registered_keywords();
 
+	if (global.mode & MODE_DIAG) {
+		cfg_run_diagnostics();
+	}
+
 	if (global.mode & MODE_CHECK) {
 		struct peers *pr;
 		struct proxy *px;
@@ -2415,10 +2419,6 @@ static void init(int argc, char **argv)
 	if (global.mode & MODE_DUMP_CFG)
 		deinit_and_exit(0);
 
-	if (global.mode & MODE_DIAG) {
-		cfg_run_diagnostics();
-	}
-
 #ifdef USE_OPENSSL
 
 	/* Initialize SSL random generator. Must be called before chroot for