diff --git a/Server/Program.cs b/Server/Program.cs
index 0b97c74f..37fb6418 100644
--- a/Server/Program.cs
+++ b/Server/Program.cs
@@ -219,7 +219,7 @@ services.AddScoped<IScriptScheduleDispatcher, ScriptScheduleDispatcher>();
 services.AddSingleton<IOtpProvider, OtpProvider>();
 services.AddSingleton<IEmbeddedServerDataSearcher, EmbeddedServerDataSearcher>();
 services.AddSingleton<ILogsManager, LogsManager>();
-services.AddSingleton(WeakReferenceMessenger.Default);
+services.AddScoped<IMessenger>((services) => new WeakReferenceMessenger());
 
 services.AddRemoteControlServer(config =>
 {
diff --git a/Server/Services/ScriptScheduler.cs b/Server/Services/ScriptScheduler.cs
index d76cf7a5..48f574ce 100644
--- a/Server/Services/ScriptScheduler.cs
+++ b/Server/Services/ScriptScheduler.cs
@@ -61,9 +61,7 @@ namespace Remotely.Server.Services
         {
             using var scope = _serviceProvider.CreateScope();
             var scriptScheduleDispatcher = scope.ServiceProvider.GetRequiredService<IScriptScheduleDispatcher>();
-            var dataService = scope.ServiceProvider.GetRequiredService<IDataService>();
             var logger = scope.ServiceProvider.GetRequiredService<ILogger<ScriptScheduler>>();
-            var circuitConnection = scope.ServiceProvider.GetRequiredService<ICircuitConnection>();
 
             try
             {