diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go
index b1c435e00f..aaacdb0c6c 100644
--- a/cmd/geth/consolecmd.go
+++ b/cmd/geth/consolecmd.go
@@ -174,8 +174,6 @@ func ephemeralConsole(ctx *cli.Context) error {
 	if err != nil {
 		utils.Fatalf("Failed to start the JavaScript console: %v", err)
 	}
-	defer console.Stop(false)
-
 	// Evaluate each of the specified JavaScript files
 	for _, file := range ctx.Args() {
 		if err = console.Execute(file); err != nil {
@@ -188,7 +186,7 @@ func ephemeralConsole(ctx *cli.Context) error {
 
 	go func() {
 		<-abort
-		os.Exit(0)
+		console.Stop(false)
 	}()
 	console.Stop(true)