diff --git a/mapbox_gl_web/lib/src/feature_manager/feature_manager.dart b/mapbox_gl_web/lib/src/feature_manager/feature_manager.dart
index 0e53a3d6d..1ccfdc880 100644
--- a/mapbox_gl_web/lib/src/feature_manager/feature_manager.dart
+++ b/mapbox_gl_web/lib/src/feature_manager/feature_manager.dart
@@ -64,9 +64,14 @@ abstract class FeatureManager<T> {
   }
 
   void _initClickHandler() {
-    map.on('click', layerId, (e) {
-      if (onTap != null) {
-        onTap('${e.features[0].id}');
+    map.on('click', (e) {
+      if (e is Event) {
+        final features = map.queryRenderedFeatures([e.point, e.point]);
+        if (features[0].source == sourceId) {
+          if (onTap != null) {
+            onTap('${features[0].id}');
+          }
+        }
       }
     });