diff --git a/include/envoy/stats/stats_macros.h b/include/envoy/stats/stats_macros.h
index 0959ff38a..bd9523ee0 100644
--- a/include/envoy/stats/stats_macros.h
+++ b/include/envoy/stats/stats_macros.h
@@ -40,9 +40,9 @@ namespace Envoy {
 #define FINISH_STAT_DECL_(X) + std::string(#X)),
 #define FINISH_STAT_DECL_MODE_(X, MODE) + std::string(#X), Envoy::Stats::Gauge::ImportMode::MODE),
 
-#define POOL_COUNTER_PREFIX(POOL, PREFIX) (POOL).counter(PREFIX FINISH_STAT_DECL_
-#define POOL_GAUGE_PREFIX(POOL, PREFIX) (POOL).gauge(PREFIX FINISH_STAT_DECL_MODE_
-#define POOL_HISTOGRAM_PREFIX(POOL, PREFIX) (POOL).histogram(PREFIX FINISH_STAT_DECL_
+#define POOL_COUNTER_PREFIX(POOL, PREFIX) (POOL).counter(Stats::VerifyPrefix(PREFIX) FINISH_STAT_DECL_
+#define POOL_GAUGE_PREFIX(POOL, PREFIX) (POOL).gauge(Stats::VerifyPrefix(PREFIX) FINISH_STAT_DECL_MODE_
+#define POOL_HISTOGRAM_PREFIX(POOL, PREFIX) (POOL).histogram(Stats::VerifyPrefix(PREFIX) FINISH_STAT_DECL_
 
 #define POOL_COUNTER(POOL) POOL_COUNTER_PREFIX(POOL, "")
 #define POOL_GAUGE(POOL) POOL_GAUGE_PREFIX(POOL, "")
@@ -52,4 +52,9 @@ namespace Envoy {
 #define NULL_STAT_DECL_IGNORE_MODE_(X, MODE) std::string(#X)),
 
 #define NULL_POOL_GAUGE(POOL) (POOL).nullGauge(NULL_STAT_DECL_IGNORE_MODE_
+
+namespace Stats {
+std::string VerifyPrefix(absl::string_view a);
+}
+
 } // namespace Envoy
diff --git a/source/common/stats/metric_impl.cc b/source/common/stats/metric_impl.cc
index 950679e6b..e7bb85afa 100644
--- a/source/common/stats/metric_impl.cc
+++ b/source/common/stats/metric_impl.cc
@@ -4,9 +4,16 @@
 
 #include "common/stats/symbol_table_impl.h"
 
+#include "absl/strings/match.h"
+
 namespace Envoy {
 namespace Stats {
 
+std::string VerifyPrefix(absl::string_view a) {
+  ASSERT(a.empty() || absl::EndsWith(a, "."));
+  return std::string(a);
+}
+
 MetricHelper::~MetricHelper() {
   // The storage must be cleaned by a subclass of MetricHelper in its
   // destructor, because the symbol-table is owned by the subclass.

bazel test //test/extensions/filters/network/mongo_proxy:proxy_test

  ASSERT(!absl::EndsWith(name, "."));