diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
index 7ccc594b946..46e9573fdb0 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactCallerContextFactory.java
@@ -1,3 +1,5 @@
+// (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
+
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
@@ -8,7 +10,6 @@
 package com.facebook.react.views.image;
 
 import androidx.annotation.Nullable;
-import com.facebook.react.uimanager.ThemedReactContext;
 
 /**
  * This interface is used from {@link ReactImageManager} to customize the CallerContext object
@@ -19,8 +20,9 @@ public interface ReactCallerContextFactory {
   /**
    * This method will be called at the time {@link ReactImageManager} creates {@link ReactImageView}
    *
-   * @param reactContext {@link ThemedReactContext} used to create the {@link ReactImageView}
+   * @param surfaceID {@link String} used to log the name of the surface
    * @return an {@link Object} that represents the CallerContext.
    */
-  Object getOrCreateCallerContext(ThemedReactContext reactContext, @Nullable String analyticTag);
+  @Nullable
+  Object getOrCreateCallerContext(@Nullable String surfaceID, @Nullable String analyticTag);
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
index e90301b6ace..7077ceb7ad9 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/image/ReactImageManager.java
@@ -107,7 +107,7 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
   public ReactImageView createViewInstance(ThemedReactContext context) {
     Object callerContext =
         mCallerContextFactory != null
-            ? mCallerContextFactory.getOrCreateCallerContext(context, null)
+            ? mCallerContextFactory.getOrCreateCallerContext(context.getSurfaceID(), null)
             : getCallerContext();
     return new ReactImageView(
         context, getDraweeControllerBuilder(), mGlobalImageLoadListener, callerContext);
@@ -129,7 +129,7 @@ public class ReactImageManager extends SimpleViewManager<ReactImageView> {
     if (mCallerContextFactory != null) {
       view.updateCallerContext(
           mCallerContextFactory.getOrCreateCallerContext(
-              (ThemedReactContext) view.getContext(), analyticTag));
+              ((ThemedReactContext) view.getContext()).getSurfaceID(), analyticTag));
     }
   }