diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index d3699524d..4f5a65cf7 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -113,6 +113,7 @@ function generateJSDataStorageObject($indexPage, $calledPath, $calledMethod)
 			'modes'=>$ci->config->item('theme_modes'),
 		],
 		'fhcomplete_build_version' => $ci->config->item('fhcomplete_build_version'),
+		'use_fhcomplete_build_version_in_path' => $ci->config->item('use_fhcomplete_build_version_in_path'),
 	);
 
 	$toPrint = "\n";
diff --git a/public/js/helpers/UrlHelpers.js b/public/js/helpers/UrlHelpers.js
index 128f29741..dbcb7af74 100644
--- a/public/js/helpers/UrlHelpers.js
+++ b/public/js/helpers/UrlHelpers.js
@@ -1,10 +1,22 @@
 const absoluteJsImportUrl = function(relativeurl)
 {
-	const absoluteurl = FHC_JS_DATA_STORAGE_OBJECT.app_root
-		+ relativeurl
-		+ '?'
-		+ FHC_JS_DATA_STORAGE_OBJECT.fhcomplete_build_version;
-	return absoluteurl;
-}
+	if(true === FHC_JS_DATA_STORAGE_OBJECT.use_fhcomplete_build_version_in_path)
+	{
+		const absoluteurl = FHC_JS_DATA_STORAGE_OBJECT.app_root
+			+ relativeurl.replace(
+				/^public\//,
+				'public/' + FHC_JS_DATA_STORAGE_OBJECT.fhcomplete_build_version + '/'
+			);
+		return absoluteurl;
+	}
+	else
+	{
+		const absoluteurl = FHC_JS_DATA_STORAGE_OBJECT.app_root
+			+ relativeurl
+			+ '?'
+			+ FHC_JS_DATA_STORAGE_OBJECT.fhcomplete_build_version;
+		return absoluteurl;
+	}	
+};
 
 export { absoluteJsImportUrl };