diff --git a/MAT.SqlRace.ServerListener/Program.cs b/MAT.SqlRace.ServerListener/Program.cs
index ce4a4ea..0b87e52 100644
--- a/MAT.SqlRace.ServerListener/Program.cs
+++ b/MAT.SqlRace.ServerListener/Program.cs
@@ -41,7 +41,13 @@ public static void Main(string[] args)
             Core.ConfigureServer(true, new IPEndPoint(IPAddress.Parse(ServerListenerIpAddress), ServerListenerPortNumber));
             var sessionManager = SessionManager.CreateSessionManager();
             var recordersConfiguration = RecordersConfiguration.GetRecordersConfiguration();
-            recordersConfiguration.AddConfiguration(Guid.NewGuid(), recorderDbEngine, dataSource, dataSource, connectionString, false);
+            recordersConfiguration.AddConfiguration(
+                Guid.NewGuid(),
+                recorderDbEngine,
+                dataSource, 
+                dataSource, 
+                connectionString, 
+                0); // DeleteSessionOnClose: 0 - no delete, 1 - delete the session on close, 2 - delete the DB
 
 
             Console.WriteLine("Creating new Session");
diff --git a/MAT.SqlRace.StandaloneRecorder/Program.cs b/MAT.SqlRace.StandaloneRecorder/Program.cs
index c4a9447..3f2f2dd 100644
--- a/MAT.SqlRace.StandaloneRecorder/Program.cs
+++ b/MAT.SqlRace.StandaloneRecorder/Program.cs
@@ -56,7 +56,12 @@ public static void Main(string[] args)
                 recorder = Recorders.CreateDataServerTelemetryRecorder();
                 recorder.SetSessionIdentifier("%y%m%d%H%M%S");
                 recorder.OnStatusChanged += recorder_OnStatusChanged;
-                recorder.SetSQLRaceConnection(Guid.NewGuid(), dbEngine, dataSource, sqlConnectionString, sqlConnectionString, false);
+                recorder.SetSQLRaceConnection(
+                    Guid.NewGuid(),
+                    dbEngine, dataSource,
+                    sqlConnectionString,
+                    sqlConnectionString,
+                    0); // DeleteSessionOnClose: 0 - no delete, 1 - delete the session on close, 2 - delete the DB
 
                 Console.WriteLine("Getting Available Server List");
                 recorder.RefreshServerList();