diff --git a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
index 308ad7fa99533ab755556507bdf68e712132d92d..1d89dc33a998bd9f7f2b10645d04df98bb41aae5 100644
--- a/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
+++ b/typo3/sysext/core/Classes/Database/SoftReferenceIndex.php
@@ -85,7 +85,7 @@ class SoftReferenceIndex {
 	/**
 	 * @todo Define visibility
 	 */
-	public $fileAdminDir = 'fileadmin';
+	public $fileAdminDir = '';
 
 	// Internal:
 	/**
@@ -93,6 +93,14 @@ class SoftReferenceIndex {
 	 */
 	public $tokenID_basePrefix = '';
 
+	/**
+	 * Class construct to set global variable
+	 *
+	 */
+	public function __construct() {
+		$this->fileAdminDir = !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] : 'fileadmin';
+	}
+
 	/**
 	 * Main function through which all processing happens
 	 *
diff --git a/typo3/sysext/impexp/classes/ImportExport.php b/typo3/sysext/impexp/classes/ImportExport.php
index c4a3486d35ee921f354b336cc3d6f4bc35af6255..2a3a035925470e8a159a49d72ea87d30bac1a83a 100644
--- a/typo3/sysext/impexp/classes/ImportExport.php
+++ b/typo3/sysext/impexp/classes/ImportExport.php
@@ -80,7 +80,7 @@ class ImportExport {
 	/**
 	 * @todo Define visibility
 	 */
-	public $fileadminFolderName = 'fileadmin';
+	public $fileadminFolderName = '';
 
 	// Whether "import" or "export" mode of object. Set through init() function
 	/**
@@ -310,6 +310,7 @@ class ImportExport {
 		$this->compress = function_exists('gzcompress');
 		$this->dontCompress = $dontCompress;
 		$this->mode = $mode;
+		$this->fileadminFolderName = !empty($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) ? $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'] : 'fileadmin';
 	}
 
 	/**************************