diff --git a/metrics/eye.cpp b/metrics/eye.cpp
index cb24332d42..b3e12645a3 100644
--- a/metrics/eye.cpp
+++ b/metrics/eye.cpp
@@ -389,6 +389,9 @@ void Eye::RegisterMapObjectEvent(MapObject const & mapObject, MapObject::Event::
 // static
 void Eye::Event::TipClicked(Tip::Type type, Tip::Event event)
 {
+  CHECK_NOT_EQUAL(type, Tip::Type::Count, ());
+  CHECK_NOT_EQUAL(event, Tip::Event::Count, ());
+
   GetPlatform().RunTask(Platform::Thread::File, [type, event]
   {
     Instance().RegisterTipClick(type, event);
@@ -425,6 +428,8 @@ void Eye::Event::DiscoveryShown()
 // static
 void Eye::Event::DiscoveryItemClicked(Discovery::Event event)
 {
+  CHECK_NOT_EQUAL(event, Discovery::Event::Count, ());
+
   GetPlatform().RunTask(Platform::Thread::File, [event]
   {
     Instance().IncrementDiscoveryItem(event);
diff --git a/metrics/eye_info.hpp b/metrics/eye_info.hpp
index 55972aaf12..30d2b9c5f4 100644
--- a/metrics/eye_info.hpp
+++ b/metrics/eye_info.hpp
@@ -47,6 +47,7 @@ class Counters<T, R, EnableIfIsEnumWithCount<T>>
 public:
   void Increment(T const key)
   {
+    CHECK_NOT_EQUAL(key, T::Count, ());
     ++m_counters[static_cast<size_t>(key)];
   }