diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
index 865df4bc02..b3086672d8 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseInstallStep.cs
@@ -45,7 +45,6 @@ namespace Umbraco.Web.Install.InstallSteps
 
             if (result.RequiresUpgrade == false)
             {
-                HandleConnectionStrings(_logger, _ioHelper, _connectionStrings, _configManipulator);
                 return Task.FromResult<InstallSetupResult>(null);
             }
 
@@ -56,27 +55,6 @@ namespace Umbraco.Web.Install.InstallSteps
             }));
         }
 
-        internal static void HandleConnectionStrings(ILogger logger, IIOHelper ioHelper, IConnectionStrings connectionStrings, IConfigManipulator configManipulator)
-        {
-
-
-            var databaseSettings = connectionStrings[Constants.System.UmbracoConnectionName];
-
-
-
-            // Remove legacy umbracoDbDsn configuration setting if it exists and connectionstring also exists
-            if (databaseSettings != null)
-            {
-                configManipulator.RemoveConnectionString();
-            }
-            else
-            {
-                var ex = new ArgumentNullException(string.Format("ConfigurationManager.ConnectionStrings[{0}]", Constants.System.UmbracoConnectionName), "Install / upgrade did not complete successfully, umbracoDbDSN was not set in the connectionStrings section");
-                logger.Error<DatabaseInstallStep>(ex, "Install / upgrade did not complete successfully, umbracoDbDSN was not set in the connectionStrings section");
-                throw ex;
-            }
-        }
-
         public override bool RequiresExecution(object model)
         {
             return true;
diff --git a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
index 91a718d0f4..dccf320787 100644
--- a/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
+++ b/src/Umbraco.Infrastructure/Intall/InstallSteps/DatabaseUpgradeStep.cs
@@ -64,8 +64,6 @@ namespace Umbraco.Web.Install.InstallSteps
                 {
                     throw new InstallException("The database failed to upgrade. ERROR: " + result.Message);
                 }
-
-                DatabaseInstallStep.HandleConnectionStrings(_logger, _ioHelper, _connectionStrings, _configManipulator);
             }
 
             return Task.FromResult<InstallSetupResult>(null);
diff --git a/src/Umbraco.Web.Common/Install/InstallApiController.cs b/src/Umbraco.Web.Common/Install/InstallApiController.cs
index b074931fc1..16a93672ba 100644
--- a/src/Umbraco.Web.Common/Install/InstallApiController.cs
+++ b/src/Umbraco.Web.Common/Install/InstallApiController.cs
@@ -25,19 +25,21 @@ namespace Umbraco.Web.Common.Install
         private readonly DatabaseBuilder _databaseBuilder;
         private readonly InstallStatusTracker _installStatusTracker;
         private readonly IRuntimeState _runtimeState;
+        private readonly IUmbracoApplicationLifetime _umbracoApplicationLifetime;
         private readonly InstallStepCollection _installSteps;
         private readonly ILogger _logger;
         private readonly IProfilingLogger _proflog;
 
         public InstallApiController(DatabaseBuilder databaseBuilder, IProfilingLogger proflog,
             InstallHelper installHelper, InstallStepCollection installSteps, InstallStatusTracker installStatusTracker,
-            IRuntimeState runtimeState)
+            IRuntimeState runtimeState, IUmbracoApplicationLifetime umbracoApplicationLifetime)
         {
             _databaseBuilder = databaseBuilder ?? throw new ArgumentNullException(nameof(databaseBuilder));
             _proflog = proflog ?? throw new ArgumentNullException(nameof(proflog));
             _installSteps = installSteps;
             _installStatusTracker = installStatusTracker;
             _runtimeState = runtimeState;
+            _umbracoApplicationLifetime = umbracoApplicationLifetime;
             InstallHelper = installHelper;
             _logger = _proflog;
         }
@@ -173,6 +175,7 @@ namespace Umbraco.Web.Common.Install
             }
 
             _installStatusTracker.Reset();
+            _umbracoApplicationLifetime.Restart();
             return new InstallProgressResultModel(true, "", "");
         }