diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 27fe4d4d9226bdd8314d48e08bb0f7c7aec5b08e..737cafabe6a2dd304215bebdf544a368ca4feffa 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -448,9 +448,12 @@ class QueryGenerator {
 			$baseTable = $field->getTableName();
 			$tableIndexList = $this->meta->getEntityTableIndexList();
 			$baseTableIndex = $tableIndexList[$baseTable];
+
+			$tableList[$field->getTableName()] = $field->getTableName();
+			$tableJoinMapping[$field->getTableName()] = $this->meta->getJoinClause($field->getTableName());
+
 			if($field->getFieldDataType() == 'reference') {
 				$moduleList = $this->referenceFieldInfoList[$fieldName];
-				$tableJoinMapping[$field->getTableName()] = 'INNER JOIN';
 				foreach($moduleList as $module) {
 					if($module == 'Users' && $baseModule != 'Users') {
 						if($fieldName == 'created_user_id' || $fieldName == 'modifiedby') {
@@ -485,9 +488,6 @@ class QueryGenerator {
 					$tableJoinMapping['vtiger_users'.$fieldName] = 'LEFT JOIN vtiger_users AS';
 				}
 			}
-			$tableList[$field->getTableName()] = $field->getTableName();
-				$tableJoinMapping[$field->getTableName()] =
-						$this->meta->getJoinClause($field->getTableName());
 		}
 		$baseTable = $this->meta->getEntityBaseTable();
 		$baseTableIndex = $moduleTableIndexList[$baseTable];