diff --git a/administrator/components/com_finder/helpers/indexer/indexer.php b/administrator/components/com_finder/helpers/indexer/indexer.php
index ca7e2db5ba8f7..8db56071bc59f 100644
--- a/administrator/components/com_finder/helpers/indexer/indexer.php
+++ b/administrator/components/com_finder/helpers/indexer/indexer.php
@@ -511,8 +511,8 @@ protected function addTokensToDb($tokens, $context = '')
 
 		$query = clone $this->addTokensToDbQueryTemplate;
 
-		// Force tokens to an array.
-		$tokens = (array) $tokens;
+		// Check if a single FinderIndexerToken object was given and make it to be an array of FinderIndexerToken objects
+		$tokens = is_array($tokens) ? $tokens : array($tokens);
 
 		// Count the number of token values.
 		$values = 0;