diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index bbe25fdd14..86a0e81f2b 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -739,8 +739,13 @@ if (rtc_include_tests) {
     sources = [ "task_queue_stdlib_unittest.cc" ]
     deps = [
       ":gunit_helpers",
+      ":logging",
+      ":rtc_event",
       ":rtc_task_queue_stdlib",
+      "../api/task_queue",
       "../api/task_queue:task_queue_test",
+      "../api/units:time_delta",
+      "../system_wrappers",
       "../test:test_main",
       "../test:test_support",
     ]
diff --git a/rtc_base/event.h b/rtc_base/event.h
index 12f6a7dca2..78b3c16646 100644
--- a/rtc_base/event.h
+++ b/rtc_base/event.h
@@ -58,6 +58,8 @@ class Event {
   // TODO(bugs.webrtc.org/14366): Consider removing this redundant alias.
   static constexpr webrtc::TimeDelta kForever =
       webrtc::TimeDelta::PlusInfinity();
+  static constexpr webrtc::TimeDelta kDefaultWarnDuration =
+      webrtc::TimeDelta::Seconds(3);
 
   Event();
   Event(bool manual_reset, bool initially_signaled);
@@ -83,7 +85,7 @@ class Event {
   // Waits with the given timeout and a reasonable default warning timeout.
   bool Wait(webrtc::TimeDelta give_up_after) {
     return Wait(give_up_after, give_up_after.IsPlusInfinity()
-                                   ? webrtc::TimeDelta::Seconds(3)
+                                   ? kDefaultWarnDuration
                                    : kForever);
   }
 
diff --git a/rtc_base/task_queue_stdlib.cc b/rtc_base/task_queue_stdlib.cc
index 1ac01e1830..8b9e554cdb 100644
--- a/rtc_base/task_queue_stdlib.cc
+++ b/rtc_base/task_queue_stdlib.cc
@@ -249,7 +249,7 @@ void TaskQueueStdlib::ProcessTasks() {
       continue;
     }
 
-    flag_notify_.Wait(task.sleep_time);
+    flag_notify_.Wait(task.sleep_time, task.sleep_time);
   }
 
   // Ensure remaining deleted tasks are destroyed with Current() set up to this
diff --git a/rtc_base/task_queue_stdlib_unittest.cc b/rtc_base/task_queue_stdlib_unittest.cc
index 0654e9719c..97f0a2cbc6 100644
--- a/rtc_base/task_queue_stdlib_unittest.cc
+++ b/rtc_base/task_queue_stdlib_unittest.cc
@@ -10,7 +10,12 @@
 
 #include "rtc_base/task_queue_stdlib.h"
 
+#include "api/task_queue/task_queue_factory.h"
 #include "api/task_queue/task_queue_test.h"
+#include "api/units/time_delta.h"
+#include "rtc_base/event.h"
+#include "rtc_base/logging.h"
+#include "system_wrappers/include/sleep.h"
 #include "test/gtest.h"
 
 namespace webrtc {
@@ -25,5 +30,32 @@ INSTANTIATE_TEST_SUITE_P(TaskQueueStdlib,
                          TaskQueueTest,
                          ::testing::Values(CreateTaskQueueFactory));
 
+class StringPtrLogSink : public rtc::LogSink {
+ public:
+  explicit StringPtrLogSink(std::string* log_data) : log_data_(log_data) {}
+
+ private:
+  void OnLogMessage(const std::string& message) override {
+    OnLogMessage(absl::string_view(message));
+  }
+  void OnLogMessage(absl::string_view message) override {
+    log_data_->append(message.begin(), message.end());
+  }
+  std::string* const log_data_;
+};
+
+TEST(TaskQueueStdlib, AvoidsSpammingLogOnInactivity) {
+  std::string log_output;
+  StringPtrLogSink stream(&log_output);
+  rtc::LogMessage::AddLogToStream(&stream, rtc::LS_VERBOSE);
+  auto task_queue = CreateTaskQueueStdlibFactory()->CreateTaskQueue(
+      "test", TaskQueueFactory::Priority::NORMAL);
+  auto wait_duration = rtc::Event::kDefaultWarnDuration + TimeDelta::Seconds(1);
+  SleepMs(wait_duration.ms());
+  EXPECT_EQ(log_output.length(), 0u);
+  task_queue = nullptr;
+  rtc::LogMessage::RemoveLogToStream(&stream);
+}
+
 }  // namespace
 }  // namespace webrtc