diff --git a/session/session.go b/session/session.go
index d2bcb5e..fdf99d9 100644
--- a/session/session.go
+++ b/session/session.go
@@ -436,12 +436,11 @@ func (s *Manager) OpenStore(id string) (*fs.Tree, error) {
 }
 
 func (s *Manager) openStore(sess *Session) (*fs.Tree, error) {
-	id := sess.RunnableID()
 	return NewSessionTree(
 		sess,
 		s.cfg.Log,
-		func() { s.KillSession(id) },
-		func(newID string) error { return s.renameSession(id, newID) },
+		func() { s.KillSession(sess.id) },
+		func(newID string) error { return s.renameSession(sess.id, newID) },
 		s.cfg.SaveTranscript,
 	), nil
 }