diff --git a/.mikaela/ssh/config b/.mikaela/ssh/config
index 2a8fa2a6..29f1be05 100644
--- a/.mikaela/ssh/config
+++ b/.mikaela/ssh/config
@@ -6,9 +6,9 @@ Host *
     ControlPath ~/.ssh/sockets/socket-%r@%h:%p
     # Multiple sessions over single connection
     ControlMaster yes
-    # Keep connection open in the background even after connection has been
-    # closed.
-    ControlPersist yes
+    # Automatically decide whether to keep connection open in the
+    # background even after connection has been closed.
+    ControlPersist auto
 
     ForwardAgent no
     ForwardX11 no
diff --git a/etc/ssh/ssh_config b/etc/ssh/ssh_config
index eb8803c5..485cf813 100644
--- a/etc/ssh/ssh_config
+++ b/etc/ssh/ssh_config
@@ -7,9 +7,9 @@ Host *
     ControlPath ~/.ssh/sockets/socket-%r@%h:%p
     # Multiple sessions over single connection
     ControlMaster yes
-    # Keep connection open in the background even after connection has been
-    # closed.
-    ControlPersist yes
+    # Automatically decide whether to keep connection open in the
+    # background even after connection has been closed.
+    ControlPersist auto
 
     ForwardAgent no
     ForwardX11 no