diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index f283e075..9a772db8 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -38,6 +38,10 @@ namespace Oqtane.Infrastructure
         {
             var defaultConnectionString = _config.GetConnectionString(SettingKeys.ConnectionStringKey);
             var defaultAlias = GetInstallationConfig(SettingKeys.DefaultAliasKey, string.Empty);
+            var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
+            
+            //create data directory if does not exists
+            if (!Directory.Exists(dataDirectory)) Directory.CreateDirectory(dataDirectory);
 
             // if no values specified, fallback to IDE installer
             if (string.IsNullOrEmpty(defaultConnectionString))
@@ -61,7 +65,6 @@ namespace Oqtane.Infrastructure
 
             if (result.Success)
             {
-                var dataDirectory = AppDomain.CurrentDomain.GetData("DataDirectory")?.ToString();
                 WriteVersionInfo(defaultConnectionString);
                 TenantMigration(defaultConnectionString, dataDirectory);
             }
@@ -69,7 +72,6 @@ namespace Oqtane.Infrastructure
             if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString))
             {
                 BuildDefaultSite(password,email);
-                
             }
         }
 
@@ -210,7 +212,6 @@ namespace Oqtane.Infrastructure
 
         private static void ModuleMigration(Assembly assembly, string connectionString)
         {
-            
             Console.WriteLine($"Migrating assembly {assembly.FullName}");
             var dbUpgradeConfig = DeployChanges.To.SqlDatabase(connectionString)
                 .WithScriptsEmbeddedInAssembly(assembly, s => !s.ToLower().Contains("uninstall.sql")); // scripts must be included as Embedded Resources