diff --git a/SafeExamBrowser.Client/ClientController.cs b/SafeExamBrowser.Client/ClientController.cs
index a0fd0284..2127bfb1 100644
--- a/SafeExamBrowser.Client/ClientController.cs
+++ b/SafeExamBrowser.Client/ClientController.cs
@@ -412,8 +412,6 @@ namespace SafeExamBrowser.Client
 					Thread.Sleep(Settings.Server.RequestAttemptInterval);
 					response = Server.SendSessionIdentifier(identifier);
 				}
-
-				Server.StartConnectivity();
 			}
 		}
 
diff --git a/SafeExamBrowser.Client/Operations/ServerOperation.cs b/SafeExamBrowser.Client/Operations/ServerOperation.cs
index c1555e9f..573e6421 100644
--- a/SafeExamBrowser.Client/Operations/ServerOperation.cs
+++ b/SafeExamBrowser.Client/Operations/ServerOperation.cs
@@ -52,11 +52,7 @@ namespace SafeExamBrowser.Client.Operations
 					Context.AppConfig.ServerExamId,
 					Context.AppConfig.ServerOauth2Token,
 					Context.Settings.Server);
-
-				if (Context.AppConfig.ServerConnectivityAutoStart)
-				{
-					server.StartConnectivity();
-				}
+				server.StartConnectivity();
 			}
 
 			return OperationResult.Success;
diff --git a/SafeExamBrowser.Configuration.Contracts/AppConfig.cs b/SafeExamBrowser.Configuration.Contracts/AppConfig.cs
index ee7300a6..7834410b 100644
--- a/SafeExamBrowser.Configuration.Contracts/AppConfig.cs
+++ b/SafeExamBrowser.Configuration.Contracts/AppConfig.cs
@@ -161,11 +161,6 @@ namespace SafeExamBrowser.Configuration.Contracts
 		/// </summary>
 		public string ServerConnectionToken { get; set; }
 
-		/// <summary>
-		/// Determines whether the server connectivity should automatically be started in case of a reconfiguration.
-		/// </summary>
-		public bool ServerConnectivityAutoStart { get; set; }
-
 		/// <summary>
 		/// The identifier of the selected server exam.
 		/// </summary>
diff --git a/SafeExamBrowser.Runtime/Operations/ServerOperation.cs b/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
index ff89e0b8..a21cd7e4 100644
--- a/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
+++ b/SafeExamBrowser.Runtime/Operations/ServerOperation.cs
@@ -139,7 +139,6 @@ namespace SafeExamBrowser.Runtime.Operations
 
 				Context.Next.AppConfig.ServerApi = Context.Current.AppConfig.ServerApi;
 				Context.Next.AppConfig.ServerConnectionToken = Context.Current.AppConfig.ServerConnectionToken;
-				Context.Next.AppConfig.ServerConnectivityAutoStart = true;
 				Context.Next.AppConfig.ServerExamId = Context.Current.AppConfig.ServerExamId;
 				Context.Next.AppConfig.ServerOauth2Token = Context.Current.AppConfig.ServerOauth2Token;