diff --git a/update_kernel.sh b/update_kernel.sh
index c72e548..2c6b05a 100755
--- a/update_kernel.sh
+++ b/update_kernel.sh
@@ -399,14 +399,14 @@
     remote_sh uname -r -v
     info "old kernel: ${old_kernel}"
     info "new kernel: ${REMOTE_OUT}"
+
+    if [ ${FLAGS_vboot} -eq ${FLAGS_TRUE} ]; then
+      check_buildid
+    fi
   else
     info "Not rebooting (per request)"
   fi
 
-  if [ ${FLAGS_vboot} -eq ${FLAGS_TRUE} ]; then
-    check_buildid
-  fi
-
   if [ -n "${FLAGS_boot_command}" ]; then
     info "Running boot command on remote"
     remote_sh "${FLAGS_boot_command}"