diff --git a/scripts/switch.sh b/scripts/switch.sh
index b7a95cbe..b6f6a2fb 100644
--- a/scripts/switch.sh
+++ b/scripts/switch.sh
@@ -57,7 +57,7 @@ main() {
         log "Previous running container is Blue."
         healthcheck "$GREEN_CONTAINER:$PORT_NUMBER/$HEALTHCHECK_API"
         switch blue green
-    elif [ "$is_green_running" = "running" ]; then
+    elif [ "$blue_start_time" ">" "$green_start_time" ]; then
         log "Previous running container is Green."
         healthcheck "$BLUE_CONTAINER:$PORT_NUMBER/$HEALTHCHECK_API"
         switch green blue