diff --git a/cpp/platform/public/count_down_latch_test.cc b/cpp/platform/public/count_down_latch_test.cc
index d8699973..1485070d 100644
--- a/cpp/platform/public/count_down_latch_test.cc
+++ b/cpp/platform/public/count_down_latch_test.cc
@@ -57,6 +57,14 @@ TEST(CountDownLatch, LatchAwaitWithTimeoutCanExpire) {
   EXPECT_FALSE(response.result());
 }
 
+TEST(CountDownLatch, InitialCountZero_AwaitDoesNotBlock) {
+  CountDownLatch latch(0);
+
+  auto response = latch.Await();
+
+  EXPECT_TRUE(response.Ok());
+}
+
 }  // namespace
 }  // namespace nearby
 }  // namespace location