diff --git a/internal/data/db.go b/internal/data/db.go
index 1e5c45d..a18626a 100644
--- a/internal/data/db.go
+++ b/internal/data/db.go
@@ -15,6 +15,6 @@ func NewDb(db *GormDb) *Db {
 	}
 }
 
-func (d *Db) DB(ctx context.Context) *gorm.DB {
-	return d.db.Client.WithContext(ctx)
+func (d *Db) DB(_ context.Context) *gorm.DB {
+	return d.db.Client
 }
diff --git a/internal/service/cmb_order.go b/internal/service/cmb_order.go
index f641bf9..a3867c8 100644
--- a/internal/service/cmb_order.go
+++ b/internal/service/cmb_order.go
@@ -49,7 +49,7 @@ func (c *CmbService) OrderFail(ctx context.Context, err error) (*v1.CmbReply, er
 
 func (c *CmbService) Order(ctx context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) {
 
-	ctx2, cancel := context.WithCancel(ctx)
+	ctx2, cancel := context.WithTimeout(ctx, 10*time.Second)
 	defer cancel()
 
 	orderNo, err := c.order(ctx2, request)