diff --git a/modules/document/queries/getDocumentListWithExtraVars.xml b/modules/document/queries/getDocumentListWithExtraVars.xml
index 4d3993952..865e3c5e9 100644
--- a/modules/document/queries/getDocumentListWithExtraVars.xml
+++ b/modules/document/queries/getDocumentListWithExtraVars.xml
@@ -2,19 +2,19 @@
 	<tables>
 		<table name="documents" />
 		<table name="document_extra_vars" alias="extra_vars" />
-		<table name="document_extra_vars" alias="extra_sort" />
+		<table name="document_extra_vars" alias="extra_sort" if="sort_eid" />
 	</tables>
 	<columns distinct="distinct">
 		<column name="documents.*" />
-		<column name="extra_sort.value" />
+		<column name="extra_sort.value" if="sort_eid" />
 	</columns>
 	<conditions>
 		<condition operation="like" column="extra_vars.value" var="var_value" />
 		<condition operation="equal" column="extra_vars.var_idx" var="var_idx" pipe="and" />
 		<condition operation="equal" column="documents.document_srl" default="extra_vars.document_srl" pipe="and" />
-		<condition operation="equal" column="extra_sort.eid" var="sort_eid" pipe="and" />
-		<condition operation="equal" column="extra_sort.lang_code" var="sort_lang" pipe="and" />
-		<condition operation="equal" column="documents.document_srl" default="extra_sort.document_srl" pipe="and" />
+		<condition operation="equal" column="extra_sort.eid" var="sort_eid" pipe="and" if="sort_eid" />
+		<condition operation="equal" column="extra_sort.lang_code" var="sort_lang" pipe="and" if="sort_eid" />
+		<condition operation="equal" column="documents.document_srl" default="extra_sort.document_srl" pipe="and" if="sort_eid" />
 		<condition operation="in" column="documents.module_srl" var="module_srl" filter="number" pipe="and" />
 		<condition operation="notin" column="documents.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
 		<condition operation="in" column="documents.category_srl" var="category_srl" filter="number" pipe="and" />