diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 6eb96c93268..ea75fe19975 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -1013,9 +1013,14 @@ var (
 		Usage: "Diagnostics HTTP server listening port",
 		Value: 6060,
 	}
+	DiagSpeedTestFlag = cli.BoolFlag{
+		Name:  "diagnostics.speedtest",
+		Usage: "Enable speed test",
+		Value: false,
+	}
 )
 
-var MetricFlags = []cli.Flag{&MetricsEnabledFlag, &MetricsHTTPFlag, &MetricsPortFlag, &DiagDisabledFlag, &DiagEndpointAddrFlag, &DiagEndpointPortFlag}
+var MetricFlags = []cli.Flag{&MetricsEnabledFlag, &MetricsHTTPFlag, &MetricsPortFlag, &DiagDisabledFlag, &DiagEndpointAddrFlag, &DiagEndpointPortFlag, &DiagSpeedTestFlag}
 
 var DiagnosticsFlags = []cli.Flag{&DiagnosticsURLFlag, &DiagnosticsURLFlag, &DiagnosticsSessionsFlag}
 
diff --git a/diagnostics/setup.go b/diagnostics/setup.go
index 7ce8b3a6d53..6534ecac245 100644
--- a/diagnostics/setup.go
+++ b/diagnostics/setup.go
@@ -20,6 +20,7 @@ var (
 	metricsPortFlag         = "metrics.port"
 	pprofPortFlag           = "pprof.port"
 	pprofAddrFlag           = "pprof.addr"
+	diagnoticsSpeedTestFlag = "diagnostics.speedtest"
 )
 
 func Setup(ctx *cli.Context, node *node.ErigonNode, metricsMux *http.ServeMux, pprofMux *http.ServeMux) {
@@ -48,7 +49,9 @@ func Setup(ctx *cli.Context, node *node.ErigonNode, metricsMux *http.ServeMux, p
 		diagMux = SetupDiagnosticsEndpoint(nil, diagAddress)
 	}
 
-	diagnostic := diaglib.NewDiagnosticClient(diagMux, node.Backend().DataDir())
+	speedTest := ctx.Bool(diagnoticsSpeedTestFlag)
+
+	diagnostic := diaglib.NewDiagnosticClient(diagMux, node.Backend().DataDir(), speedTest)
 	diagnostic.Setup()
 
 	SetupEndpoints(ctx, node, diagMux, diagnostic)
diff --git a/erigon-lib/diagnostics/client.go b/erigon-lib/diagnostics/client.go
index 284e46c1498..df5b04a76fc 100644
--- a/erigon-lib/diagnostics/client.go
+++ b/erigon-lib/diagnostics/client.go
@@ -10,6 +10,7 @@ import (
 type DiagnosticClient struct {
 	metricsMux  *http.ServeMux
 	dataDirPath string
+	speedTest   bool
 
 	syncStats           SyncStatistics
 	snapshotFileList    SnapshoFilesList
@@ -26,10 +27,11 @@ type DiagnosticClient struct {
 	networkSpeedMutex   sync.Mutex
 }
 
-func NewDiagnosticClient(metricsMux *http.ServeMux, dataDirPath string) *DiagnosticClient {
+func NewDiagnosticClient(metricsMux *http.ServeMux, dataDirPath string, speedTest bool) *DiagnosticClient {
 	return &DiagnosticClient{
 		metricsMux:       metricsMux,
 		dataDirPath:      dataDirPath,
+		speedTest:        speedTest,
 		syncStats:        SyncStatistics{},
 		hardwareInfo:     HardwareInfo{},
 		snapshotFileList: SnapshoFilesList{},
diff --git a/erigon-lib/diagnostics/speedtest.go b/erigon-lib/diagnostics/speedtest.go
index d2c463bbbbb..77da08ac7a6 100644
--- a/erigon-lib/diagnostics/speedtest.go
+++ b/erigon-lib/diagnostics/speedtest.go
@@ -8,22 +8,11 @@ import (
 )
 
 func (d *DiagnosticClient) setupSpeedtestDiagnostics(rootCtx context.Context) {
-	ticker := time.NewTicker(30 * time.Minute)
 	go func() {
-		d.networkSpeedMutex.Lock()
-		d.networkSpeed = d.runSpeedTest(rootCtx)
-		d.networkSpeedMutex.Unlock()
-
-		for {
-			select {
-			case <-ticker.C:
-				d.networkSpeedMutex.Lock()
-				d.networkSpeed = d.runSpeedTest(rootCtx)
-				d.networkSpeedMutex.Unlock()
-			case <-rootCtx.Done():
-				ticker.Stop()
-				return
-			}
+		if d.speedTest {
+			d.networkSpeedMutex.Lock()
+			d.networkSpeed = d.runSpeedTest(rootCtx)
+			d.networkSpeedMutex.Unlock()
 		}
 	}()
 }