diff --git a/server/server.go b/server/server.go
index 18a6442..a487e79 100644
--- a/server/server.go
+++ b/server/server.go
@@ -33,16 +33,17 @@ func Serve(ctx lib.Context) {
 	r.Use(gin.Recovery())
 	r.Use(Logger(ctx))
 	cfg := ctx.Config().(*Cfg)
+	if cfg.Addr == "" {
+		if cfg.Port == "" {
+			cfg.Port = "8123"
+		}
+		cfg.Addr = ":" + cfg.Port
+	}
 	for _, rcfg := range cfg.routes {
 		setRoute(ctx, rcfg, r)
 	}
-	srv := &http.Server{
-		Addr:    ":8123",
-		Handler: r,
-	}
-	ctx.WithState(&ServerState{
-		server: srv,
-	})
+	srv := &http.Server{Addr: cfg.Addr, Handler: r}
+	ctx.WithState(&ServerState{server: srv})
 	lib.RunCtx(ctx, func(ctx lib.Context) {
 		srv.ListenAndServe()
 	})
@@ -67,7 +68,7 @@ func handleMsg(ctx lib.Context, cfg *mhSpec, gc *gin.Context) {
 	msg := message.New(head...).WithSender(cctx)
 	// if gc.Request.Method == "POST" && data != "": msg.WithPayload(data)
 	core.HandleMessage(cctx, msg)
-	code, data := cfg.proc(ctx, msg)
+	code, data := cfg.proc(cctx, msg)
 	gc.JSON(code, data)
 }