diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
index 37f7000a915..bb093d2691d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactClickableSpan.java
@@ -52,7 +52,8 @@ class ReactClickableSpan extends ClickableSpan implements ReactSpan {
     EventDispatcher eventDispatcher =
         UIManagerHelper.getEventDispatcherForReactTag(context, mReactTag);
     if (eventDispatcher != null) {
-      eventDispatcher.dispatchEvent(new ViewGroupClickEvent(mReactTag));
+      eventDispatcher.dispatchEvent(
+          new ViewGroupClickEvent(UIManagerHelper.getSurfaceId(context), mReactTag));
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
index 66aacfcfd15..1192b50f2e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java
@@ -239,7 +239,9 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
               if (mEventDispatcher == null) {
                 return;
               }
-              mEventDispatcher.dispatchEvent(new ViewGroupClickEvent(view.getId()));
+              mEventDispatcher.dispatchEvent(
+                  new ViewGroupClickEvent(
+                      UIManagerHelper.getSurfaceId(view.getContext()), view.getId()));
             }
           });
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
index c328752a564..d7a380802fb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ViewGroupClickEvent.java
@@ -7,16 +7,22 @@
 
 package com.facebook.react.views.view;
 
+import androidx.annotation.Nullable;
 import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.events.Event;
-import com.facebook.react.uimanager.events.RCTEventEmitter;
 
 /** Represents a Click on the ReactViewGroup */
 public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
   private static final String EVENT_NAME = "topClick";
 
+  @Deprecated
   public ViewGroupClickEvent(int viewId) {
-    super(viewId);
+    this(-1, viewId);
+  }
+
+  public ViewGroupClickEvent(int surfaceId, int viewId) {
+    super(surfaceId, viewId);
   }
 
   @Override
@@ -29,8 +35,9 @@ public class ViewGroupClickEvent extends Event<ViewGroupClickEvent> {
     return false;
   }
 
+  @Nullable
   @Override
-  public void dispatch(RCTEventEmitter rctEventEmitter) {
-    rctEventEmitter.receiveEvent(getViewTag(), getEventName(), Arguments.createMap());
+  protected WritableMap getEventData() {
+    return Arguments.createMap();
   }
 }