diff --git a/app/command-line/userinput.go b/app/command-line/userinput.go
index 91d6a858292ea75cf0c403074aa2487567eba198..fcb4adc6645f95f754bf1f2760dd10558bd8ee91 100644
--- a/app/command-line/userinput.go
+++ b/app/command-line/userinput.go
@@ -68,7 +68,7 @@ func UserInputLoop(config Config, isAlsoServer bool, objectStorage Blob) {
 		fmt.Println("2. Rate a transaction (from the client)")
 		fmt.Println("3. Fabricate a fake transaction")
 		fmt.Println("4. Print all transactions")
-		fmt.Println("8. Exit")
+		fmt.Println("6. Exit")
 		fmt.Print("Your choice: ")
 		_, err := fmt.Scanln(&operation)
 		if err != nil {
@@ -173,12 +173,8 @@ func UserInputLoop(config Config, isAlsoServer bool, objectStorage Blob) {
 			fmt.Println("You chose to ask for all transactions of a given node")
 			break
 		case "6":
-			break
-		case "7":
-			break
-		case "8":
 			fmt.Println("You chose to exit")
-			os.Exit(0)
+			return
 		default:
 			fmt.Println("You chose an invalid option")
 			break