diff --git a/tools/edbconnect/main/main.go b/tools/edbconnect/main/main.go
index 32f8595c11..87123f5827 100644
--- a/tools/edbconnect/main/main.go
+++ b/tools/edbconnect/main/main.go
@@ -53,7 +53,7 @@ func startREPL(db *sql.DB) {
 		Prompt:          ">>> ",
 		HistoryFile:     "/tmp/readline.tmp",
 		InterruptPrompt: "^C",
-		AutoComplete:    readline.NewPrefixCompleter(),
+		EOFPrompt:       "exit",
 	})
 	if err != nil {
 		log.Fatal(err)