diff --git a/src/platform/mix.library/Services/MixThemeImportService.cs b/src/platform/mix.library/Services/MixThemeImportService.cs
index 6fe73393a..4bc859640 100644
--- a/src/platform/mix.library/Services/MixThemeImportService.cs
+++ b/src/platform/mix.library/Services/MixThemeImportService.cs
@@ -30,7 +30,10 @@ public MixTenantSystemModel CurrentTenant
             {
                 if (_currentTenant == null)
                 {
-                    _currentTenant = _session.Get<MixTenantSystemModel>(MixRequestQueryKeywords.Tenant);
+                    _currentTenant = _session?.Get<MixTenantSystemModel>(MixRequestQueryKeywords.Tenant) ?? new()
+                    {
+                        Id = 1
+                    };
                 }
                 return _currentTenant;
             }