diff --git a/pkg/bbgo/environment.go b/pkg/bbgo/environment.go
index f819f3f28..07893aaad 100644
--- a/pkg/bbgo/environment.go
+++ b/pkg/bbgo/environment.go
@@ -648,7 +648,7 @@ func (environ *Environment) syncSession(
 	log.Infof("syncing symbols %v from session %s", symbols, session.Name)
 
 	syncBufferPeriod := -defaultSyncBufferPeriod
-	if environ.environmentConfig.SyncBufferPeriod != nil {
+	if environ.environmentConfig != nil && environ.environmentConfig.SyncBufferPeriod != nil {
 		syncBufferPeriod = -environ.environmentConfig.SyncBufferPeriod.Duration()
 	}
 
diff --git a/pkg/service/trade.go b/pkg/service/trade.go
index 01a347bca..16a64d076 100644
--- a/pkg/service/trade.go
+++ b/pkg/service/trade.go
@@ -335,7 +335,7 @@ func (s *TradeService) Query(options QueryTradesOptions) ([]types.Trade, error)
 func (s *TradeService) Load(ctx context.Context, id int64) (*types.Trade, error) {
 	var trade types.Trade
 
-	rows, err := s.DB.NamedQuery("SELECT * FROM trades WHERE id = :id", map[string]interface{}{
+	rows, err := s.DB.NamedQueryContext(ctx, "SELECT * FROM trades WHERE id = :id", map[string]interface{}{
 		"id": id,
 	})
 	if err != nil {