diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index b4ac3794348..dd996f83f57 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -95,7 +95,9 @@ if ($action == 'builddoc' && $permissioncreate)
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
 
-	            header('Location: '.$_SERVER['REQUEST_URI'].'#builddoc');
+	            $redirecturl = $_SERVER['REQUEST_URI'];
+	            $redirecturl = preg_replace('/&?action=builddoc/', '', $redirecturl);		// Remove action=builddoc parameter to avoid infinite loop
+	            header('Location: '.$redirecturl.'#builddoc');
 	            exit;
         	}
         }