diff --git a/src/main.c b/src/main.c
index e15c3776..67a52c73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2142,6 +2142,12 @@ main (int    argc,
     {
       ply_trace ("could not log bootup: %m");
 
+      if (state.is_attached)
+        {
+          ply_trace ("detaching from session");
+          ply_terminal_session_detach (state.session);
+        }
+
       if (daemon_handle != NULL)
         ply_detach_daemon (daemon_handle, EX_UNAVAILABLE);
       return EX_UNAVAILABLE;