diff --git a/Agent/Program.cs b/Agent/Program.cs
index f9bebf01..b03d5681 100644
--- a/Agent/Program.cs
+++ b/Agent/Program.cs
@@ -47,10 +47,10 @@ namespace Remotely.Agent
             });
             serviceCollection.AddSingleton<DeviceSocket>();
             serviceCollection.AddScoped<ChatClientService>();
-            serviceCollection.AddScoped<Bash>();
-            serviceCollection.AddScoped<CMD>();
-            serviceCollection.AddScoped<PSCore>();
-            serviceCollection.AddScoped<WindowsPS>();
+            serviceCollection.AddTransient<Bash>();
+            serviceCollection.AddTransient<CMD>();
+            serviceCollection.AddTransient<PSCore>();
+            serviceCollection.AddTransient<WindowsPS>();
             serviceCollection.AddScoped<ConfigService>();
             serviceCollection.AddScoped<Logger>();
             serviceCollection.AddScoped<Updater>();
diff --git a/Agent/Services/PSCore.cs b/Agent/Services/PSCore.cs
index aa4a0288..e25f985c 100644
--- a/Agent/Services/PSCore.cs
+++ b/Agent/Services/PSCore.cs
@@ -92,8 +92,8 @@ namespace Remotely.Agent.Services
 
         private void ProcessIdleTimeout_Elapsed(object sender, ElapsedEventArgs e)
         {
-            PS?.Dispose();
             Sessions.TryRemove(ConnectionID, out _);
+            PS?.Dispose();
         }
     }
 }