diff --git a/boot_control_android.cc b/boot_control_android.cc
index 4c998b1..4a010bd 100644
--- a/boot_control_android.cc
+++ b/boot_control_android.cc
@@ -245,6 +245,10 @@
 }
 
 bool BootControlAndroid::SetActiveBootSlot(Slot slot) {
+  if (slot != GetCurrentSlot() && !dynamic_control_->FinishUpdate()) {
+    return false;
+  }
+
   CommandResult result;
   auto ret = module_->setActiveBootSlot(slot, StoreResultCallback(&result));
   if (!ret.isOk()) {