diff --git a/addons/godot-firebase/firestore/firestore.gd b/addons/godot-firebase/firestore/firestore.gd
index 772a228..78915aa 100644
--- a/addons/godot-firebase/firestore/firestore.gd
+++ b/addons/godot-firebase/firestore/firestore.gd
@@ -125,7 +125,8 @@ func query(query : FirestoreQuery) -> Array:
 	task._fields = JSON.stringify(body)
 	task._url = url
 	_pooled_request(task)
-	return await _handle_task_finished(task)
+	var result = await _handle_task_finished(task)
+	return result if result != null else []
 
 
 ## Request a list of contents (documents and/or collections) inside a collection, specified by its [i]id[/i]. This method will return a [code]FirestoreTask[/code] object, representing a reference to the request issued. If saved into a variable, the [code]FirestoreTask[/code] object can be used to yield checked the [code]result_query(result)[/code] signal, or the more generic [code]task_finished(result)[/code] signal.
diff --git a/tests/firestore/firestore.gd b/tests/firestore/firestore.gd
index e27afae..19fb0f5 100644
--- a/tests/firestore/firestore.gd
+++ b/tests/firestore/firestore.gd
@@ -146,10 +146,10 @@ func _test_firestore() -> void:
 	## Query Collection
 	_print_to_console("\nRunning Firestore Query")
 	var query : FirestoreQuery = FirestoreQuery.new()
-	query.from("Firebasetester")
-	query.where("points", FirestoreQuery.OPERATOR.GREATER_THAN, 5)
+	query.from("Firebasetester", false)
 	query.order_by("points", FirestoreQuery.DIRECTION.DESCENDING)
-	query.limit(10)
+	query.where("points", FirestoreQuery.OPERATOR.GREATER_THAN, 5)
+	query.limit(1)
 	var result = await Firebase.Firestore.query(query)
 	_print_to_console(result)
 	$run_query.button_pressed = true