diff --git a/cyber/base/bounded_queue.h b/cyber/base/bounded_queue.h
index 3a1e7f0e0c5..9e4d56d06d6 100644
--- a/cyber/base/bounded_queue.h
+++ b/cyber/base/bounded_queue.h
@@ -171,14 +171,13 @@ bool BoundedQueue<T>::WaitEnqueue(const T& element) {
   while (!break_all_wait_) {
     if (Enqueue(element)) {
       return true;
-    } else {
-      if (wait_strategy_->EmptyWait()) {
+    }
+    if (wait_strategy_->EmptyWait()) {
         continue;
-      }
-      // wait timeout
-      return false;
     }
+    // wait timeout
   }
+
   return false;
 }
 
@@ -187,14 +186,13 @@ bool BoundedQueue<T>::WaitEnqueue(T&& element) {
   while (!break_all_wait_) {
     if (Enqueue(element)) {
       return true;
-    } else {
-      if (wait_strategy_->EmptyWait()) {
-        continue;
-      }
-      // wait timeout
-      return false;
     }
+    if (wait_strategy_->EmptyWait()) {
+      continue;
+    }
+    // wait timeout
   }
+
   return false;
 }
 
@@ -203,14 +201,13 @@ bool BoundedQueue<T>::WaitDequeue(T* element) {
   while (!break_all_wait_) {
     if (Dequeue(element)) {
       return true;
-    } else {
-      if (wait_strategy_->EmptyWait()) {
+    }
+    if (wait_strategy_->EmptyWait()) {
         continue;
-      }
-      // wait timeout
-      return false;
     }
+    // wait timeout
   }
+
   return false;
 }