diff --git a/cmd/thanos/flags.go b/cmd/thanos/flags.go
index 47885544b7a..135552e6f6a 100644
--- a/cmd/thanos/flags.go
+++ b/cmd/thanos/flags.go
@@ -41,7 +41,7 @@ func regHTTPAddrFlag(cmd *kingpin.CmdClause) *string {
 }
 
 func regHTTPGracePeriodFlag(cmd *kingpin.CmdClause) *model.Duration {
-	return modelDuration(cmd.Flag("http-grace-period", "The time to wait after an interrupt received.").Default("5s"))
+	return modelDuration(cmd.Flag("http-grace-period", "Time to wait after an interrupt received for HTTP Server.").Default("5s"))
 }
 
 func regCommonObjStoreFlags(cmd *kingpin.CmdClause, suffix string, required bool, extraDesc ...string) *extflag.PathOrContent {
diff --git a/docs/components/compact.md b/docs/components/compact.md
index b39b65ee65c..df1056f571e 100644
--- a/docs/components/compact.md
+++ b/docs/components/compact.md
@@ -84,6 +84,8 @@ Flags:
                                https://thanos.io/tracing.md/#configuration
       --http-address="0.0.0.0:10902"
                                Listen host:port for HTTP endpoints.
+      --http-grace-period=5s   Time to wait after an interrupt received for HTTP
+                               Server.
       --data-dir="./data"      Data directory in which to cache blocks and
                                process compactions.
       --objstore.config-file=<file-path>
diff --git a/docs/components/query.md b/docs/components/query.md
index c10c03b3285..3ebf692471a 100644
--- a/docs/components/query.md
+++ b/docs/components/query.md
@@ -259,6 +259,8 @@ Flags:
                                  https://thanos.io/tracing.md/#configuration
       --http-address="0.0.0.0:10902"
                                  Listen host:port for HTTP endpoints.
+      --http-grace-period=5s     Time to wait after an interrupt received for
+                                 HTTP Server.
       --grpc-address="0.0.0.0:10901"
                                  Listen ip:port address for gRPC endpoints
                                  (StoreAPI). Make sure this address is routable
diff --git a/docs/components/rule.md b/docs/components/rule.md
index ba766090e07..a697dc02fbb 100644
--- a/docs/components/rule.md
+++ b/docs/components/rule.md
@@ -168,6 +168,8 @@ Flags:
                                  https://thanos.io/tracing.md/#configuration
       --http-address="0.0.0.0:10902"
                                  Listen host:port for HTTP endpoints.
+      --http-grace-period=5s     Time to wait after an interrupt received for
+                                 HTTP Server.
       --grpc-address="0.0.0.0:10901"
                                  Listen ip:port address for gRPC endpoints
                                  (StoreAPI). Make sure this address is routable
diff --git a/docs/components/sidecar.md b/docs/components/sidecar.md
index a1d1a92112c..5546ad20f20 100644
--- a/docs/components/sidecar.md
+++ b/docs/components/sidecar.md
@@ -101,6 +101,8 @@ Flags:
                                  https://thanos.io/tracing.md/#configuration
       --http-address="0.0.0.0:10902"
                                  Listen host:port for HTTP endpoints.
+      --http-grace-period=5s     Time to wait after an interrupt received for
+                                 HTTP Server.
       --grpc-address="0.0.0.0:10901"
                                  Listen ip:port address for gRPC endpoints
                                  (StoreAPI). Make sure this address is routable
diff --git a/docs/components/store.md b/docs/components/store.md
index 9e5b7fe9433..6f11cebc9d5 100644
--- a/docs/components/store.md
+++ b/docs/components/store.md
@@ -51,6 +51,8 @@ Flags:
                                  https://thanos.io/tracing.md/#configuration
       --http-address="0.0.0.0:10902"
                                  Listen host:port for HTTP endpoints.
+      --http-grace-period=5s     Time to wait after an interrupt received for
+                                 HTTP Server.
       --grpc-address="0.0.0.0:10901"
                                  Listen ip:port address for gRPC endpoints
                                  (StoreAPI). Make sure this address is routable