diff --git a/lua/csgithub/init.lua b/lua/csgithub/init.lua
index 11043ce..545d36b 100644
--- a/lua/csgithub/init.lua
+++ b/lua/csgithub/init.lua
@@ -13,6 +13,9 @@ M.search = function(args)
 
 	local query = require("csgithub.query")
 	local q = query.construct_query(merged_args)
+	if q == nil then
+		return nil
+	end
 	local url = query.construct_url(q)
 
 	return url
diff --git a/lua/csgithub/query.lua b/lua/csgithub/query.lua
index 10fffec..8b1f464 100644
--- a/lua/csgithub/query.lua
+++ b/lua/csgithub/query.lua
@@ -43,6 +43,10 @@ end
 M.construct_query = function(args)
 	local query_parts = {}
 
+	local query_text = M.construct_query_text()
+	if query_text == "" then
+		return nil
+	end
 	-- path:
 	if args.includeFilename or args.includeExtension then
 		local path = M.construct_query_path(args)
@@ -51,7 +55,7 @@ M.construct_query = function(args)
 	end
 
 	-- text
-	table.insert(query_parts, M.construct_query_text())
+	table.insert(query_parts, query_text)
 
 	return table.concat(query_parts, " ")
 end