diff --git a/code/service/querybuilders/SolrQueryBuilder.php b/code/service/querybuilders/SolrQueryBuilder.php
index 08159f2..109d4ec 100644
--- a/code/service/querybuilders/SolrQueryBuilder.php
+++ b/code/service/querybuilders/SolrQueryBuilder.php
@@ -66,7 +66,7 @@ class SolrQueryBuilder {
 	protected $facetCount = 1;
 
 	public function baseQuery($query) {
-		$this->userQuery = $query;
+		$this->userQuery = $query ?: '*:*';
 		return $this;
 	}
 	
diff --git a/composer.json b/composer.json
index 22a5fd4..5ea466c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "5.3.x-dev"
+			"dev-master": "6.0.x-dev"
 		}
 	}
 }