diff --git a/tools/edbconnect/edb-connect.sh b/tools/edbconnect/edb-connect.sh
index 48518051d3..6b69ff82f9 100644
--- a/tools/edbconnect/edb-connect.sh
+++ b/tools/edbconnect/edb-connect.sh
@@ -36,7 +36,7 @@ docker run --name $CONTAINER_NAME \
   -v $VOLUME_NAME:/enclavedata \
   --device $SGX_ENCLAVE_DEVICE:$SGX_ENCLAVE_DEVICE:rwm \
   --device $SGX_PROVISION_DEVICE:$SGX_PROVISION_DEVICE:rwm \
-  $IMAGE_NAME $COMMAND
+  -it $IMAGE_NAME $COMMAND
 
 # After the REPL exits, destroy the container
 echo "Destroying the container ${CONTAINER_NAME} after command exits..."
diff --git a/tools/edbconnect/main/main.go b/tools/edbconnect/main/main.go
index 20ed19873a..344d2568bf 100644
--- a/tools/edbconnect/main/main.go
+++ b/tools/edbconnect/main/main.go
@@ -54,8 +54,9 @@ func startREPL(db *sql.DB) {
 		query, err := reader.ReadString('\n')
 		if err != nil {
 			fmt.Println("Error reading user input:", err)
-			return
+			continue
 		}
+		fmt.Println("")
 
 		// Trim the newline character and surrounding whitespace
 		query = strings.TrimSpace(query)
@@ -163,23 +164,3 @@ func isPrintableString(data []byte) bool {
 	}
 	return true
 }
-
-//func main() {
-//	fmt.Println("Checking for existing EDB credentials...")
-//	file, found, err := edgelessdb.LoadCredentialsFromFile()
-//	if err != nil {
-//		fmt.Println("Error loading credentials from file:", err)
-//		panic(err)
-//	}
-//	if !found {
-//		panic("No existing EDB credentials found.")
-//	}
-//
-//	credJson, err := json.Marshal(file)
-//	if err != nil {
-//		fmt.Println("Error loading credentials from file:", err)
-//		panic(err)
-//	}
-//	fmt.Println("Found existing EDB credentials in file:", credJson)
-//
-//}