diff --git a/envsetup.sh b/envsetup.sh
index f7810b7..c572c16 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -1627,6 +1627,7 @@
         fi
     fi
     adb start-server
+    adb wait-for-online
     adb root
     sleep 1
     adb wait-for-online shell mount /system 2>&1 > /dev/null
@@ -1671,6 +1672,7 @@
         fi
     fi
     adb start-server
+    adb wait-for-online
     adb root
     sleep 1
     adb wait-for-online shell mount /system 2>&1 >> /dev/null