diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fad31ee..8bc1c1a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 - [Fix 4907: make admin serve HTTP only](https://github.com/beego/beego/pull/5005)
 - [Feat 4999: add get all tasks function](https://github.com/beego/beego/pull/4999)
 - [Fix 5012: fix some bug, pass []any as any in variadic function](https://github.com/beego/beego/pull/5012)
+- [Fix 5022: Miss assigning listener to graceful Server](https://github.com/beego/beego/pull/5028)
 
 
 # v2.0.4
diff --git a/core/config/toml/toml.go b/core/config/toml/toml.go
index d278e8dc..ca4eb74e 100644
--- a/core/config/toml/toml.go
+++ b/core/config/toml/toml.go
@@ -20,6 +20,7 @@ import (
 	"strings"
 
 	"github.com/beego/beego/v2/core/config"
+	"github.com/pelletier/go-toml"
 )
 
 const keySeparator = "."
diff --git a/server/web/grace/server.go b/server/web/grace/server.go
index c8a5f840..982849f3 100644
--- a/server/web/grace/server.go
+++ b/server/web/grace/server.go
@@ -38,6 +38,7 @@ func (srv *Server) Serve() (err error) {
 }
 
 func (srv *Server) ServeWithListener(ln net.Listener) (err error) {
+	srv.ln = ln
 	go srv.handleSignals()
 	return srv.internalServe(ln)
 }