diff --git a/tests/broken_tests.txt b/tests/broken_tests.txt
index 02935712325..da2493faa1e 100644
--- a/tests/broken_tests.txt
+++ b/tests/broken_tests.txt
@@ -37,7 +37,6 @@
 01319_optimize_skip_unused_shards_nesting
 01353_low_cardinality_join_types
 01455_shard_leaf_max_rows_bytes_to_read
-01487_distributed_in_not_default_db
 01495_subqueries_in_with_statement
 01504_rocksdb
 01527_dist_sharding_key_dictGet_reload
diff --git a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
index ccd2c571290..cd027530ac8 100644
--- a/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
+++ b/tests/queries/0_stateless/01487_distributed_in_not_default_db.sql
@@ -25,6 +25,10 @@ CREATE TABLE d AS t ENGINE = Distributed(test_cluster_two_shards_different_datab
 USE test_01487;
 DROP DATABASE test_01487;
 
+-- After the default database is dropped QueryAnalysisPass cannot process the following SELECT query.
+-- That query is invalid on the initiator node.
+set allow_experimental_analyzer = 0;
+
 SELECT * FROM main_01487.d WHERE value IN (SELECT l.value FROM l) ORDER BY value;
 
 USE main_01487;