diff --git a/node/execution/intrinsics/token/token_execution_engine.go b/node/execution/intrinsics/token/token_execution_engine.go
index 5a5cd3e..23a1426 100644
--- a/node/execution/intrinsics/token/token_execution_engine.go
+++ b/node/execution/intrinsics/token/token_execution_engine.go
@@ -635,6 +635,10 @@ func (e *TokenExecutionEngine) hyperSync() {
 		"hypergraph root commit",
 		zap.String("root", hex.EncodeToString(roots[0])),
 	)
+
+	if err = e.hypergraphStore.SaveHypergraph(e.hypergraph); err != nil {
+		e.logger.Error("error while saving", zap.Error(err))
+	}
 }
 
 func (e *TokenExecutionEngine) rebuildHypergraph() {
diff --git a/node/rpc/hypergraph_sync_rpc_server.go b/node/rpc/hypergraph_sync_rpc_server.go
index d8e209b..c9f0908 100644
--- a/node/rpc/hypergraph_sync_rpc_server.go
+++ b/node/rpc/hypergraph_sync_rpc_server.go
@@ -377,7 +377,7 @@ outer:
 				},
 			}
 			if err := stream.Send(queryMsg); err != nil {
-				return err
+				break outer
 			}
 
 		case msg, ok := <-incomingOut:
@@ -797,7 +797,7 @@ outer:
 						queryPath,
 						metadataOnly,
 					); err != nil {
-						return err
+						break outer
 					}
 				} else {
 					logger.Info(
diff --git a/node/store/hypergraph.go b/node/store/hypergraph.go
index 7937ef8..88ba70e 100644
--- a/node/store/hypergraph.go
+++ b/node/store/hypergraph.go
@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"encoding/gob"
 	"encoding/hex"
-	"fmt"
 	"io/fs"
 	"os"
 	"path"
@@ -238,8 +237,6 @@ func (p *PebbleHypergraphStore) LoadHypergraph() (
 					return nil
 				}
 
-				fmt.Println(d.Name())
-
 				shardSet, err := hex.DecodeString(d.Name())
 				if err != nil {
 					return err