diff --git a/riscv/htif.cc b/riscv/htif.cc
index 02809d08..3bb8b991 100644
--- a/riscv/htif.cc
+++ b/riscv/htif.cc
@@ -51,6 +51,11 @@ void htif_t::wait_for_start()
   while(wait_for_packet() != APP_CMD_START);
 }
 
+void htif_t::wait_for_tohost_write()
+{
+  while(wait_for_packet() != APP_CMD_READ_CONTROL_REG);
+}
+
 void htif_t::wait_for_fromhost_write()
 {
   while(wait_for_packet() != APP_CMD_WRITE_CONTROL_REG);
diff --git a/riscv/htif.h b/riscv/htif.h
index 01066957..d7a8c898 100644
--- a/riscv/htif.h
+++ b/riscv/htif.h
@@ -19,6 +19,7 @@ public:
 
   // we block on the host if the target machine reads the fromhost register,
   // which provides determinism in tohost/fromhost communication.
+  void wait_for_tohost_write();
   void wait_for_fromhost_write();
 
 private:
diff --git a/riscv/sim.cc b/riscv/sim.cc
index 65125e49..9020da45 100644
--- a/riscv/sim.cc
+++ b/riscv/sim.cc
@@ -58,6 +58,7 @@ void sim_t::set_tohost(reg_t val)
 {
   fromhost = 0;
   tohost = val;
+  htif->wait_for_tohost_write();
 }
 
 reg_t sim_t::get_fromhost()