diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0e417b55..700bd7007 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,4 @@
+* Disabled reporting of `ydb_go_sdk_ydb_query_session_create_latency histogram metrics` when metrics are disabled
 * Allowed skip column for `ScanStruct` by tag `-` 
 
 ## v3.81.4
diff --git a/metrics/query.go b/metrics/query.go
index d8a849adc..78acde2c3 100644
--- a/metrics/query.go
+++ b/metrics/query.go
@@ -124,8 +124,8 @@ func query(config Config) (t trace.Query) {
 						errs.With(map[string]string{
 							"status": errorBrief(info.Error),
 						}).Inc()
+						latency.With(nil).Record(time.Since(start))
 					}
-					latency.With(nil).Record(time.Since(start))
 				}
 			}
 		}