diff --git a/SafeExamBrowser.Service/Operations/SessionInitializationOperation.cs b/SafeExamBrowser.Service/Operations/SessionInitializationOperation.cs
index ad223551..fb54b144 100644
--- a/SafeExamBrowser.Service/Operations/SessionInitializationOperation.cs
+++ b/SafeExamBrowser.Service/Operations/SessionInitializationOperation.cs
@@ -42,10 +42,16 @@ namespace SafeExamBrowser.Service.Operations
 		public override OperationResult Revert()
 		{
 			var success = true;
+			var wasRunning = Context.IsRunning;
 
-			logger.Info("Finalizing current session...");
+			logger.Info("Starting auto-restore mechanism...");
+			Context.AutoRestoreMechanism.Start();
 
-			if (Context.ServiceEvent != null && Context.IsRunning)
+			logger.Info("Clearing session data...");
+			Context.Configuration = null;
+			Context.IsRunning = false;
+
+			if (Context.ServiceEvent != null && wasRunning)
 			{
 				success = Context.ServiceEvent.Set();
 
@@ -59,13 +65,6 @@ namespace SafeExamBrowser.Service.Operations
 				}
 			}
 
-			logger.Info("Starting auto-restore mechanism...");
-			Context.AutoRestoreMechanism.Start();
-
-			logger.Info("Clearing session data...");
-			Context.Configuration = null;
-			Context.IsRunning = false;
-
 			return success ? OperationResult.Success : OperationResult.Failed;
 		}