diff --git a/monasca-log-api/start.sh b/monasca-log-api/start.sh
index b10a3f1ec..155d205d9 100755
--- a/monasca-log-api/start.sh
+++ b/monasca-log-api/start.sh
@@ -14,8 +14,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   success="false"
 
   for i in $(seq "$KAFKA_WAIT_RETRIES"); do
-    python /kafka_wait_for_topics.py
-    if [ $? -eq 0 ]; then
+    if python /kafka_wait_for_topics.py; then
       success="true"
       break
     else
diff --git a/monasca-log-metrics/start.sh b/monasca-log-metrics/start.sh
index e5f8cd13f..8055036c4 100755
--- a/monasca-log-metrics/start.sh
+++ b/monasca-log-metrics/start.sh
@@ -8,8 +8,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
   success="false"
 
   for i in $(seq "$KAFKA_WAIT_RETRIES"); do
-    python /kafka_wait_for_topics.py
-    if [ $? -eq 0 ]; then
+    if python /kafka_wait_for_topics.py; then
       success="true"
       break
     else