diff --git a/cmd/cmd.go b/cmd/cmd.go
index 299d0a6..0b51c08 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"flag"
 
 	"gitea.com/gitea/gitea-mcp/operation"
@@ -57,6 +58,10 @@ func init() {
 func Execute(version string) {
 	defer log.Default().Sync()
 	if err := operation.Run(transport, version); err != nil {
+		if err == context.Canceled {
+			log.Info("Server shutdown due to context cancellation")
+			return
+		}
 		log.Fatalf("Run Gitea MCP Server Error: %v", err)
 	}
 }