diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 2e12a9ad8..7cfb853c8 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -722,11 +722,14 @@ class documentController extends document {
 			return $output;
 		}
 
-		$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
-		if(!$output->toBool())
+		if($var_idx != NULL)
 		{
-			$oDB->rollback();
-			return $output;
+			$output = $oDB->executeQuery('document.updateDocumentExtraKeyIdxOrder', $obj);
+			if(!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
 		$output =  executeQuery('document.deleteDocumentExtraVars', $obj);
@@ -736,11 +739,14 @@ class documentController extends document {
 			return $output;
 		}
 
-		$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
-		if(!$output->toBool())
+		if($var_idx != NULL)
 		{
-			$oDB->rollback();
-			return $output;
+			$output = $oDB->executeQuery('document.updateDocumentExtraVarIdxOrder', $obj);
+			if(!$output->toBool())
+			{
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
 		$oDB->commit();
diff --git a/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml b/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
index 16aaf9fca..101e55eaa 100644
--- a/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
+++ b/modules/document/queries/updateDocumentExtraKeyIdxOrder.xml
@@ -7,6 +7,6 @@
 	</columns>
 	<conditions>
 		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" />
+		<condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
 	</conditions>
 </query>
diff --git a/modules/document/queries/updateDocumentExtraVarIdxOrder.xml b/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
index a6ad2101b..83887df85 100644
--- a/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
+++ b/modules/document/queries/updateDocumentExtraVarIdxOrder.xml
@@ -7,6 +7,6 @@
 	</columns>
 	<conditions>
 		<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-		<condition operation="excess" column="var_idx" var="var_idx" filter="number" pipe="and" />
+		<condition operation="excess" column="var_idx" var="var_idx" filter="number" notnull="notnull" pipe="and" />
 	</conditions>
 </query>