diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c
index ab80404854429b8ed0c490bbbf28fb6619bddfe9..8a86fa590db195e183484c720a3759446ecad717 100644
--- a/block/blk-mq-debugfs.c
+++ b/block/blk-mq-debugfs.c
@@ -915,6 +915,9 @@ void blk_mq_debugfs_register_hctx(struct request_queue *q,
 	char name[20];
 	int i;
 
+	if (!q->debugfs_dir)
+		return;
+
 	snprintf(name, sizeof(name), "hctx%u", hctx->queue_num);
 	hctx->debugfs_dir = debugfs_create_dir(name, q->debugfs_dir);