diff --git a/builder/amazon/common/step_run_source_instance.go b/builder/amazon/common/step_run_source_instance.go
index d0767d4a8..85bc7bd70 100644
--- a/builder/amazon/common/step_run_source_instance.go
+++ b/builder/amazon/common/step_run_source_instance.go
@@ -99,7 +99,7 @@ func (s *StepRunSourceInstance) Cleanup(state map[string]interface{}) {
 		Conn:    ec2conn,
 		Pending: []string{"pending", "running", "shutting-down", "stopped", "stopping"},
 		Refresh: InstanceStateRefreshFunc(ec2conn, s.instance),
-		Target:  "running",
+		Target:  "terminated",
 	}
 
 	WaitForState(&stateChange)