diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index b8d7315fc0f..65672f0583c 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -103,7 +103,6 @@ void DatabaseAtomic::attachTable(ContextPtr /* context_ */, const String & name,
     auto table_id = table->getStorageID();
     assertDetachedTableNotInUse(table_id.uuid);
     DatabaseOrdinary::attachTableUnlocked(name, table);
-    detached_tables.erase(table_id.uuid);
 
     table_name_to_path.emplace(std::make_pair(name, relative_table_path));
 }
diff --git a/src/Storages/System/StorageSystemDetachedTables.cpp b/src/Storages/System/StorageSystemDetachedTables.cpp
index 560056b891a..158edb7818f 100644
--- a/src/Storages/System/StorageSystemDetachedTables.cpp
+++ b/src/Storages/System/StorageSystemDetachedTables.cpp
@@ -31,12 +31,12 @@ class DetachedTablesBlockSource : public ISource
 public:
     DetachedTablesBlockSource(
         std::vector<UInt8> columns_mask_,
-        Block header,
+        Block header_,
         UInt64 max_block_size_,
         ColumnPtr databases_,
         ColumnPtr detached_tables_,
         ContextPtr context_)
-        : ISource(std::move(header))
+        : ISource(std::move(header_))
         , columns_mask(std::move(columns_mask_))
         , max_block_size(max_block_size_)
         , databases(std::move(databases_))
@@ -63,7 +63,9 @@ protected:
         const auto access = context->getAccess();
         const bool need_to_check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
 
-        for (size_t database_idx = 0, rows_count = 0; database_idx < databases->size() && rows_count < max_block_size; ++database_idx)
+        size_t database_idx = 0;
+        size_t rows_count = 0;
+        for (; database_idx < databases->size() && rows_count < max_block_size; ++database_idx)
         {
             database_name = databases->getDataAt(database_idx).toString();
             database = DatabaseCatalog::instance().tryGetDatabase(database_name);
@@ -92,8 +94,11 @@ protected:
             }
         }
 
+        if (databases->size() == database_idx && max_block_size != rows_count)
+        {
+            done = true;
+        }
         const UInt64 num_rows = result_columns.at(0)->size();
-        done = true;
         return Chunk(std::move(result_columns), num_rows);
     }
 
diff --git a/tests/queries/0_stateless/03172_system_detached_tables.reference b/tests/queries/0_stateless/03172_system_detached_tables.reference
index ce19daa4cdc..83d1ff13942 100644
--- a/tests/queries/0_stateless/03172_system_detached_tables.reference
+++ b/tests/queries/0_stateless/03172_system_detached_tables.reference
@@ -6,6 +6,6 @@ test03172_system_detached_tables	test_table_perm	1
 test03172_system_detached_tables	test_table	0
 -----------------------
 database lazy tests
-test03172_system_detached_tables_lazy	test_table	0
-test03172_system_detached_tables_lazy	test_table_perm	1
+before attach	test03172_system_detached_tables_lazy	test_table	0
+before attach	test03172_system_detached_tables_lazy	test_table_perm	1
 DROP TABLE
diff --git a/tests/queries/0_stateless/03172_system_detached_tables.sql b/tests/queries/0_stateless/03172_system_detached_tables.sql
index 64f30a9d275..1a3c2d7cc0f 100644
--- a/tests/queries/0_stateless/03172_system_detached_tables.sql
+++ b/tests/queries/0_stateless/03172_system_detached_tables.sql
@@ -39,12 +39,12 @@ CREATE TABLE test03172_system_detached_tables_lazy.test_table_perm (number UInt6
 INSERT INTO test03172_system_detached_tables_lazy.test_table_perm SELECT * FROM numbers(100);
 DETACH table test03172_system_detached_tables_lazy.test_table_perm PERMANENTLY;
 
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
+SELECT 'before attach', database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
 
 ATTACH TABLE test03172_system_detached_tables_lazy.test_table;
 ATTACH TABLE test03172_system_detached_tables_lazy.test_table_perm;
 
-SELECT database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
+SELECT 'after attach', database, table, is_permanently FROM system.detached_tables WHERE database='test03172_system_detached_tables_lazy';
 
 SELECT 'DROP TABLE';
 DROP TABLE  test03172_system_detached_tables_lazy.test_table SYNC;