diff --git a/Oqtane.Server/Infrastructure/DatabaseManager.cs b/Oqtane.Server/Infrastructure/DatabaseManager.cs
index 1b7c5dd2..2d23f219 100644
--- a/Oqtane.Server/Infrastructure/DatabaseManager.cs
+++ b/Oqtane.Server/Infrastructure/DatabaseManager.cs
@@ -63,6 +63,7 @@ namespace Oqtane.Infrastructure
             if (_isInstalled && !IsDefaultSiteInstalled(defaultConnectionString))
             {
                 BuildDefaultSite(password,email);
+                
             }
         }
 
@@ -319,10 +320,13 @@ namespace Oqtane.Infrastructure
                 var userRoles = scope.ServiceProvider.GetRequiredService<IUserRoleRepository>();
                 var folders = scope.ServiceProvider.GetRequiredService<IFolderRepository>();
                 var identityUserManager = scope.ServiceProvider.GetRequiredService<UserManager<IdentityUser>>();
+                var tenants = scope.ServiceProvider.GetRequiredService<ITenantRepository>();
+
+                var tenant = tenants.GetTenants().First();
 
                 var site = new Site
                 {
-                    TenantId = -1,
+                    TenantId = tenant.TenantId,
                     Name = "Default Site",
                     LogoFileId = null,
                     DefaultThemeType = GetInstallationConfig(SettingKeys.DefaultThemeKey, Constants.DefaultTheme),
@@ -341,6 +345,8 @@ namespace Oqtane.Infrastructure
                     DisplayName = GetInstallationConfig(SettingKeys.HostUserKey, Constants.HostUser),
                 };
                 CreateHostUser(folders, userRoles, roles, users, identityUserManager, user);
+                tenant.IsInitialized = true;
+                tenants.UpdateTenant(tenant);
             }
         }
 
diff --git a/Oqtane.Server/Repository/TenantRepository.cs b/Oqtane.Server/Repository/TenantRepository.cs
index 0689f3c2..6c22ba75 100644
--- a/Oqtane.Server/Repository/TenantRepository.cs
+++ b/Oqtane.Server/Repository/TenantRepository.cs
@@ -38,9 +38,9 @@ namespace Oqtane.Repository
 
         public Tenant UpdateTenant(Tenant tenant)
         {
-            var oldTenant = GetTenant(tenant.TenantId);
+            var oldTenant =_db.Tenant.AsNoTracking().FirstOrDefault(t=> t.TenantId == tenant.TenantId);
             
-            if (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name))
+            if (oldTenant != null && (oldTenant.Name.Equals(Constants.MasterTenant, StringComparison.OrdinalIgnoreCase) && !oldTenant.Name.Equals(tenant.Name)))
             {
                 throw new InvalidOperationException("Unable to rename the master tenant.");
             }