diff --git a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
index f872885d1d..ff04373f14 100644
--- a/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
+++ b/source/java/org/alfresco/repo/importer/ImporterBootstrap.java
@@ -304,8 +304,12 @@ public class ImporterBootstrap extends AbstractLifecycleBean
         PropertyCheck.mandatory(this, "importerService", importerService);
         PropertyCheck.mandatory(this, "storeRef", storeRef);
 
-        
-        Authentication authentication = authenticationComponent.setSystemUserAsCurrentUser();
+        // note: in MT case, this will run in System context of tenant domain
+        Authentication authentication = authenticationComponent.getCurrentAuthentication();
+        if (authenticationComponent.getCurrentUserName() == null)
+        {
+            authenticationComponent.setCurrentUser(authenticationComponent.getSystemUserName());
+        }
 
         RetryingTransactionCallback<Object> doImportCallback = new RetryingTransactionCallback<Object>()
         {