diff --git a/pyfox/commands.py b/pyfox/commands.py
index d05f530..7b76608 100644
--- a/pyfox/commands.py
+++ b/pyfox/commands.py
@@ -77,6 +77,8 @@ def get_bottom_toolbar_tokens(cli):
                                     completer=sql_completer, get_title=lambda: "Foxtrot", enable_history_search=True,
                                     get_bottom_toolbar_tokens=get_bottom_toolbar_tokens, style=style)
 
+                if query_text is None or len(query_text) == 0:
+                    continue
                 results = self.text_processor.process(query_text)
                 PagedPresenter(JsonFormatter()).present(results)
                 self._update_completion(results)
diff --git a/setup.py b/setup.py
index c788ac9..ca64d90 100644
--- a/setup.py
+++ b/setup.py
@@ -2,12 +2,12 @@
 setup(
     name = 'pyfox',
     packages = ['pyfox'],
-    version = '0.17',
+    version = '0.18',
     description = 'Shell for foxtrot',
     author = 'Shubham Sharma',
     author_email = 'shubham.sha12@gmail.com',
     url = 'https://github.com/gabber12/pyfox',
-    download_url = 'https://github.com/gabber12/pyfox/archive/0.17.tar.gz',
+    download_url = 'https://github.com/gabber12/pyfox/archive/0.18.tar.gz',
     classifiers = [],
     entry_points = {
                     'console_scripts': ['foxtrot=pyfox.commands:main'],