diff --git a/transport/LegacySupport.cpp b/transport/LegacySupport.cpp
index 44e6df1..17371d4 100644
--- a/transport/LegacySupport.cpp
+++ b/transport/LegacySupport.cpp
@@ -35,6 +35,9 @@
     while (!property_get_bool(kDataProperty, false)) {
         std::this_thread::sleep_for(300ms);
     }
+
+    // TODO(b/35178781) wait a bit longer
+    std::this_thread::sleep_for(300ms);
 }
 
 namespace details {