diff --git a/session_rpcserver.go b/session_rpcserver.go
index 2b4e7fa5..a9264b9b 100644
--- a/session_rpcserver.go
+++ b/session_rpcserver.go
@@ -58,7 +58,7 @@ type sessionRpcServer struct {
 // sessionRpcServerConfig holds the values used to configure the
 // sessionRpcServer.
 type sessionRpcServerConfig struct {
-	db                      *session.BoltStore
+	db                      session.Store
 	basicAuth               string
 	grpcOptions             []grpc.ServerOption
 	registerGrpcServers     func(server *grpc.Server)
@@ -175,10 +175,6 @@ func (s *sessionRpcServer) start(ctx context.Context) error {
 func (s *sessionRpcServer) stop() error {
 	var returnErr error
 	s.stopOnce.Do(func() {
-		if err := s.cfg.db.Close(); err != nil {
-			log.Errorf("Error closing session DB: %v", err)
-			returnErr = err
-		}
 		s.sessionServer.Stop()
 
 		close(s.quit)
diff --git a/terminal.go b/terminal.go
index 0c84844d..e184faee 100644
--- a/terminal.go
+++ b/terminal.go
@@ -1457,6 +1457,13 @@ func (g *LightningTerminal) shutdownSubServers() error {
 		}
 	}
 
+	if g.sessionDB != nil {
+		if err := g.sessionDB.Close(); err != nil {
+			log.Errorf("Error closing session DB: %v", err)
+			returnErr = err
+		}
+	}
+
 	if g.lndClient != nil {
 		g.lndClient.Close()
 	}