diff --git a/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper b/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper
index 4508a613a4d887bd5d5e05890989a6bcd49a6bee..60b7fa550cc033116dce6021b4c59704ae807232 100755
--- a/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper
+++ b/config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper
@@ -60,15 +60,10 @@ See https://tails.boum.org/doc/first_steps/upgrade#manual\"`"
 
 ### Main
 
-# wait for the $TORDATE_DIR directory to appear
-while [ ! -d "$TORDATE_DIR" ]; do
-      sleep 10
+while ! sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped ; do
+   sleep 10
 done
 
-# wait for a guarantee that time is in Tor valid range
-while ! [ -e "$TORDATE_DONE_FILE" ]; do
-   inotifywait -q -t "$INOTIFY_TIMEOUT" -e create --format %w%f "$TORDATE_DIR"
-done
 
 check_free_memory "$MIN_MEMFREE" "$MIN_TOTAL_MEMFREE"