diff --git a/logd/FlushCommand.cpp b/logd/FlushCommand.cpp
index cb3d1c278..48036d340 100644
--- a/logd/FlushCommand.cpp
+++ b/logd/FlushCommand.cpp
@@ -36,7 +36,7 @@ FlushCommand::FlushCommand(LogReader &reader,
         mLogMask(logMask),
         mPid(pid),
         mStart(start),
-        mTimeout(timeout) {
+        mTimeout((start > 1) ? timeout : 0) {
 }
 
 // runSocketCommand is called once for every open client on the