diff --git a/cmd/XDC/main.go b/cmd/XDC/main.go
index 1f63a9d007..30b3a09663 100644
--- a/cmd/XDC/main.go
+++ b/cmd/XDC/main.go
@@ -254,6 +254,9 @@ func XDC(ctx *cli.Context) error {
 	defer stack.Close()
 	startNode(ctx, stack, backend, cfg)
 	stack.Wait()
+	if engine, ok := backend.Engine().(*XDPoS.XDPoS); ok {
+		engine.Stop()
+	}
 	return nil
 }
 
diff --git a/consensus/XDPoS/XDPoS.go b/consensus/XDPoS/XDPoS.go
index c497650f71..3b5cb13f05 100644
--- a/consensus/XDPoS/XDPoS.go
+++ b/consensus/XDPoS/XDPoS.go
@@ -119,6 +119,14 @@ func New(chainConfig *params.ChainConfig, db ethdb.Database) *XDPoS {
 	}
 }
 
+// Stop stops the consensus engine:
+//   - close chanel MinePeriodCh
+//   - close chanel NewRoundCh
+func (x *XDPoS) Stop() {
+	close(x.MinePeriodCh)
+	close(x.NewRoundCh)
+}
+
 // NewFullFaker creates an ethash consensus engine with a full fake scheme that
 // accepts all blocks as valid, without checking any consensus rules whatsoever.
 func NewFaker(db ethdb.Database, chainConfig *params.ChainConfig) *XDPoS {
diff --git a/miner/worker.go b/miner/worker.go
index e2f76afc79..3bdeaf891a 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -277,9 +277,7 @@ func (w *worker) update() {
 	// timeout waiting for v1 inital value
 	minePeriod := 2
 	MinePeriodCh := w.engine.(*XDPoS.XDPoS).MinePeriodCh
-	defer close(MinePeriodCh)
 	NewRoundCh := w.engine.(*XDPoS.XDPoS).NewRoundCh
-	defer close(NewRoundCh)
 
 	timeout := time.NewTimer(time.Duration(minePeriod) * time.Second)
 	defer timeout.Stop()