diff --git a/cli/command/container/run.go b/cli/command/container/run.go
index 56f0d0d57b..695a5cf9ae 100644
--- a/cli/command/container/run.go
+++ b/cli/command/container/run.go
@@ -190,10 +190,11 @@ func runContainer(dockerCli *command.DockerCli, opts *runOptions, copts *contain
 		}
 
 		close, err := attachContainer(ctx, dockerCli, &errCh, config, createResponse.ID)
-		defer close()
+
 		if err != nil {
 			return err
 		}
+		defer close()
 	}
 
 	statusChan := waitExitOrRemoved(ctx, dockerCli, createResponse.ID, copts.autoRemove)