diff --git a/docs/sources/c-tracker/emitters/index.md b/docs/sources/c-tracker/emitters/index.md
index e3c7bc6d5..5ec330739 100644
--- a/docs/sources/c-tracker/emitters/index.md
+++ b/docs/sources/c-tracker/emitters/index.md
@@ -90,12 +90,21 @@ The retry delay calculation is an exponential function with multiplicative facto
 
 ## Manual flushing
 
-You may want to force an emitter to send all events in its buffer, even if the buffer is not full. The Tracker class has a `flush()` method which flushes its emitter.
+You may want to force an emitter to send all events in its buffer, even if the buffer is not full. The Tracker class has a `flush()` method which flushes its emitter.
 
-Example:
+`flush()` waits up to the configured flush timeout (default 30 seconds) for the event queue to drain before calling `stop()` and returning. If the timeout expires before the queue empties — for example, because the collector endpoint is unreachable — `flush()` still calls `stop()` and returns; any undelivered events remain in the SQLite event store and will be retried in the next session when a new emitter is started.
+
+You can configure the flush timeout via `EmitterConfiguration::set_flush_timeout_ms()`. Pass `0` to wait indefinitely. The timeout applies only to unreachable or slow collectors — events delivered to a reachable collector drain in milliseconds and are unaffected.
 
 ```cpp
-tracker->flush();
+EmitterConfiguration emitter_config("sp.db");
+emitter_config.set_flush_timeout_ms(5000); // wait up to 5 seconds for the queue to drain
+
+auto tracker = Snowplow::create_tracker(tracker_config, network_config, emitter_config, session_config);
+
+// ... track events ...
+
+tracker->flush(); // blocks for up to 5 seconds, then stops the emitter
 ```
 
 ## Using a custom HTTP Client
diff --git a/docs/sources/c-tracker/initialisation/index.md b/docs/sources/c-tracker/initialisation/index.md
index 9a637ba3e..e860d97e4 100644
--- a/docs/sources/c-tracker/initialisation/index.md
+++ b/docs/sources/c-tracker/initialisation/index.md
@@ -146,6 +146,7 @@ Additionally, it provides the following setter functions:
 | `set_byte_limit_post`              | The byte limit when sending a POST request.                                                                                                  | 40000 bytes |
 | `set_request_callback`             | Set a callback to call after emit requests are made with the resulting emit status (see page about Emitter for more info).                   | None        |
 | `set_custom_retry_for_status_code` | Set a custom retry rule for when the HTTP status code is received in emit response from Collector (see page about Emitter for more details). | None        |
+| `set_flush_timeout_ms`             | Maximum time in ms that `flush()` waits for the event queue to empty before stopping. Events not yet delivered remain in SQLite for the next session. Pass `0` for no timeout (waits indefinitely). | 30000 ms |
 
 ### Session configuration using "SessionConfiguration"