diff --git a/pkg/apiserver/apic.go b/pkg/apiserver/apic.go
index e0a968d61..e2cac2d45 100644
--- a/pkg/apiserver/apic.go
+++ b/pkg/apiserver/apic.go
@@ -131,7 +131,7 @@ func NewAPIC(config *csconfig.OnlineApiClientCfg, dbClient *database.Client) (*a
 		Scenarios:      ret.scenarioList,
 		UpdateScenario: ret.FetchScenariosListFromDB,
 	})
-	return ret, nil
+	return ret, err
 }
 
 func (a *apic) Push() error {
diff --git a/pkg/apiserver/apiserver.go b/pkg/apiserver/apiserver.go
index bd7140fa5..f386d1109 100644
--- a/pkg/apiserver/apiserver.go
+++ b/pkg/apiserver/apiserver.go
@@ -30,7 +30,6 @@ type APIServer struct {
 	TLS            *csconfig.TLSCfg
 	dbClient       *database.Client
 	logFile        string
-	ctx            context.Context
 	controller     *controllers.Controller
 	flushScheduler *gocron.Scheduler
 	router         *gin.Engine