diff --git a/phpBB/includes/template/twig/node/includeasset.php b/phpBB/includes/template/twig/node/includeasset.php
index 647ae22d81..5abff10e3f 100644
--- a/phpBB/includes/template/twig/node/includeasset.php
+++ b/phpBB/includes/template/twig/node/includeasset.php
@@ -33,8 +33,7 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 			->write("\$asset_file = ")
 			->subcompile($this->getNode('expr'))
 			->raw(";\n")
-			->write("\$argument_string = '?assets_version={$config['assets_version']}';\n")
-			->write("\$anchor_string = '';\n")
+			->write("\$argument_string = \$anchor_string = '';\n")
 			->write("if ((\$argument_string_start = strpos(\$asset_file, '?')) !== false) {\n")
 			->indent()
 				->write("\$argument_string = substr(\$asset_file, \$argument_string_start);\n")
@@ -45,12 +44,12 @@ class phpbb_template_twig_node_includeasset extends Twig_Node
 					->write("\$argument_string = substr(\$argument_string, 0, \$anchor_string_start);\n")
 				->outdent()
 				->write("}\n")
-				->write("\$argument_string .= '&assets_version=" . $config['assets_version'] . "';\n")
 			->outdent()
 			->write("}\n")
 			->write("if (strpos(\$asset_file, '//') !== 0 && strpos(\$asset_file, 'http://') !== 0 && strpos(\$asset_file, 'https://') !== 0 && !file_exists(\$asset_file)) {\n")
 			->indent()
 				->write("\$asset_file = \$this->getEnvironment()->getLoader()->getCacheKey(\$asset_file);\n")
+				->write("\$argument_string .= ((\$argument_string) ? '&' : '?') . 'assets_version={$config['assets_version']}';\n")
 			->outdent()
 			->write("}\n")
 			->write("\$asset_file .= \$argument_string . \$anchor_string;\n")
diff --git a/tests/template/template_includejs_test.php b/tests/template/template_includejs_test.php
index d4a384a1c5..ea5c30891b 100644
--- a/tests/template/template_includejs_test.php
+++ b/tests/template/template_includejs_test.php
@@ -78,15 +78,15 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
 			),
 			array(
 				array('TEST' => 15),
-				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>',
+				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d#f"></script>',
 			),
 			array(
 				array('TEST' => 16),
-				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1&assets_version=1#f"></script>',
+				'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=1#f"></script>',
 			),
 			array(
 				array('TEST' => 17),
-				'<script type="text/javascript" src="//phpbb.com/b.js?assets_version=1"></script>',
+				'<script type="text/javascript" src="//phpbb.com/b.js"></script>',
 			),
 		);
 	}