diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index d6342e3973e..46254d0c3a2 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -168,6 +168,8 @@ public:
     void shutdown() override
     {
         stopFlushThread();
+
+        auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
         if (table)
             table->flushAndShutdown();
     }
@@ -186,7 +188,6 @@ private:
     /* Saving thread data */
     const StorageID table_id;
     const String storage_def;
-    StoragePtr table;
     String create_query;
     String old_create_query;
     bool is_prepared = false;
@@ -525,7 +526,7 @@ void SystemLog<LogElement>::prepareTable()
 {
     String description = table_id.getNameForLogs();
 
-    table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
+    auto table = DatabaseCatalog::instance().tryGetTable(table_id, getContext());
 
     if (table)
     {
diff --git a/tests/integration/test_system_logs_recreate/test.py b/tests/integration/test_system_logs_recreate/test.py
index 3ab0269b42e..c0afa8cd555 100644
--- a/tests/integration/test_system_logs_recreate/test.py
+++ b/tests/integration/test_system_logs_recreate/test.py
@@ -68,3 +68,26 @@ def test_system_logs_recreate():
     # IOW that the table created only when the structure is indeed different.
     for table in system_logs:
         assert len(node.query(f"SHOW TABLES FROM system LIKE '{table}%'").strip().split('\n')) == 3
+
+
+def test_drop_system_log():
+    node.exec_in_container(['bash', '-c', f"""echo "
+        <clickhouse>
+            <query_log>
+                <flush_interval_milliseconds replace=\\"replace\\">1000000</flush_interval_milliseconds>
+            </query_log>
+        </clickhouse>
+        " > /etc/clickhouse-server/config.d/yyy-override-query_log.xml
+        """])
+    node.restart_clickhouse()
+    node.query("select 1")
+    node.query("system flush logs")
+    node.query("select 2")
+    node.query("system flush logs")
+    assert node.query("select count() > 0 from system.query_log") == "1\n"
+    node.query("drop table system.query_log sync")
+    node.query("select 3")
+    node.query("system flush logs")
+    assert node.query("select count() > 0 from system.query_log") == "1\n"
+    node.exec_in_container(['rm', f'/etc/clickhouse-server/config.d/yyy-override-query_log.xml'])
+    node.restart_clickhouse()