diff --git a/src/Storages/S3Queue/S3QueueHolder.cpp b/src/Storages/S3Queue/S3QueueHolder.cpp
index 21b2b7a45ce..1b708154bcd 100644
--- a/src/Storages/S3Queue/S3QueueHolder.cpp
+++ b/src/Storages/S3Queue/S3QueueHolder.cpp
@@ -159,7 +159,7 @@ void S3QueueHolder::setFileProcessed(const String & file_path)
     if (zookeeper->tryGet(fs::path(zookeeper_processing_path), node_data))
     {
         S3FilesCollection processing_files = parseCollection(node_data);
-        for (auto x : processing_files)
+        for (const auto & x : processing_files)
         {
             if (x != file_path)
             {
@@ -251,7 +251,7 @@ void S3QueueHolder::setFilesProcessing(Strings & file_paths)
     if (zookeeper->tryGet(fs::path(zookeeper_processing_path), node_data))
     {
         S3FilesCollection processing_files = parseCollection(node_data);
-        for (auto x : processing_files)
+        for (const auto & x : processing_files)
         {
             if (!std::count(file_paths.begin(), file_paths.end(), x))
             {
diff --git a/src/Storages/S3Queue/S3QueueSource.cpp b/src/Storages/S3Queue/S3QueueSource.cpp
index 0e0b00d2d3f..eb49db8e84d 100644
--- a/src/Storages/S3Queue/S3QueueSource.cpp
+++ b/src/Storages/S3Queue/S3QueueSource.cpp
@@ -48,10 +48,8 @@
 #    include <Common/NamedCollections/NamedCollections.h>
 #    include <Common/parseGlobs.h>
 
-#    include <filesystem>
 #    include <Processors/ISource.h>
 #    include <Processors/Sinks/SinkToStorage.h>
-#    include <QueryPipeline/Pipe.h>
 
 namespace fs = std::filesystem;
 
diff --git a/src/Storages/S3Queue/StorageS3Queue.cpp b/src/Storages/S3Queue/StorageS3Queue.cpp
index 09dc094eae5..5a011c9b51a 100644
--- a/src/Storages/S3Queue/StorageS3Queue.cpp
+++ b/src/Storages/S3Queue/StorageS3Queue.cpp
@@ -539,10 +539,13 @@ bool StorageS3Queue::createTableIfNotExists(const StorageMetadataPtr & metadata_
     for (size_t i = 0; i < 1000; ++i)
     {
         Coordination::Requests ops;
+        bool is_first_replica = true;
         if (zookeeper->exists(zookeeper_path + "/metadata"))
         {
+            if (!zookeeper->exists(zookeeper_path + "/processing"))
+                ops.emplace_back(zkutil::makeCreateRequest(zookeeper_path + "/processing", "", zkutil::CreateMode::Ephemeral));
             LOG_DEBUG(log, "This table {} is already created, will use existing metadata for checking engine settings", zookeeper_path);
-            return false;
+            is_first_replica = false;
         }
         else
         {
@@ -569,7 +572,7 @@ bool StorageS3Queue::createTableIfNotExists(const StorageMetadataPtr & metadata_
             zkutil::KeeperMultiException::check(code, ops, responses);
         }
 
-        return true;
+        return is_first_replica;
     }
 
     throw Exception(
diff --git a/src/Storages/S3Queue/StorageS3Queue.h b/src/Storages/S3Queue/StorageS3Queue.h
index ac098cdda99..73f8075b7d1 100644
--- a/src/Storages/S3Queue/StorageS3Queue.h
+++ b/src/Storages/S3Queue/StorageS3Queue.h
@@ -130,7 +130,6 @@ private:
     zkutil::ZooKeeperPtr getZooKeeper() const;
     bool createTableIfNotExists(const StorageMetadataPtr & metadata_snapshot);
     void checkTableStructure(const String & zookeeper_prefix, const StorageMetadataPtr & metadata_snapshot);
-    // Return default or custom zookeeper name for table
     const String & getZooKeeperPath() const { return zookeeper_path; }
 
     using KeysWithInfo = StorageS3QueueSource::KeysWithInfo;