diff --git a/extended/code_update/host_code_update.robot b/extended/code_update/host_code_update.robot
index 445b700..c44749d 100644
--- a/extended/code_update/host_code_update.robot
+++ b/extended/code_update/host_code_update.robot
@@ -77,7 +77,8 @@
     ...  Fail  Cannot boot the OS.
 
     REST Power On  stack_mode=skip
-    Upload And Activate Image  ${ALTERNATE_IMAGE_FILE_PATH}
+    Upload And Activate Image
+    ...  ${ALTERNATE_IMAGE_FILE_PATH}  skip_if_active=true
     REST Power On  stack_mode=normal
     Verify Running Host Image  ${ALTERNATE_IMAGE_FILE_PATH}
 
@@ -208,7 +209,7 @@
 
     Should Not Be Empty  ${ALTERNATE_IMAGE_FILE_PATH}
     Delete All PNOR Images
-    Upload And Activate Image  ${IMAGE_FILE_PATH}
+    Upload And Activate Image  ${IMAGE_FILE_PATH}  skip_if_active=true
 
 Get PNOR Extended Version
     [Documentation]  Return the PNOR extended version.
diff --git a/lib/code_update_utils.robot b/lib/code_update_utils.robot
index 2dee39b..16836cc 100644
--- a/lib/code_update_utils.robot
+++ b/lib/code_update_utils.robot
@@ -246,7 +246,7 @@
     # image_file_path  The path to the image to upload.
     # image_purpose    The purpose in the image's MANIFEST file.
 
-    Upload And Activate Image  ${image_file_path}
+    Upload And Activate Image  ${image_file_path}  skip_if_active=true
     Verify No Duplicate Image Priorities  ${image_purpose}