diff --git a/src/cli.cpp b/src/cli.cpp
index 3ed40e8..9827fa3 100644
--- a/src/cli.cpp
+++ b/src/cli.cpp
@@ -293,6 +293,9 @@
         try {
             command_ cmd = parser.parseCommand(line, std::cout);
             boost::apply_visitor(Interpreter(parser, proxyDatastore), cmd);
+            if (cmd.type() == typeid(quit_)) {
+                break;
+            }
         } catch (InvalidCommandException& ex) {
             std::cerr << ex.what() << std::endl;
         } catch (DatastoreException& ex) {