diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index 170694f352201ef18a9bbaa5539f08f20cac430c..ef458c3c886f22137fbb6e0c21e4c01656de4534 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -237,7 +237,7 @@ Setup a *report* to manage all *forms*:
 	# If there is a form given by SIP: show
 	form={{form:SE}}
 
-	# Only needed if QFQ uses more than one database.
+	# In case DB_INDEX_QFQ is different from DB_INDEX_DATA, set DB_INDEX_QFQ.
 	dbIndex = {{DB_INDEX_QFQ:Y}}
 
 	10 {
diff --git a/extension/qfq/qfq/AbstractBuildForm.php b/extension/qfq/qfq/AbstractBuildForm.php
index a4a24ece9126be3c0887c6099013b1a570ab34e7..35154dd51d62e64abb482dc45b9da33609bd6023 100644
--- a/extension/qfq/qfq/AbstractBuildForm.php
+++ b/extension/qfq/qfq/AbstractBuildForm.php
@@ -289,6 +289,7 @@ abstract class AbstractBuildForm {
             'id' => $this->store->getVar(SYSTEM_EDIT_FORM_PAGE, STORE_SYSTEM),
             'form' => $form,
             'r' => $recordId,
+            PARAM_DB_INDEX_DATA => $this->dbIndexQfq,
         ];
         $queryStringArray = array_merge($queryStringArray, $param);