diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 6c827b983..d8e5d17bc 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -575,13 +575,6 @@ extern NSString *RCTBridgeModuleNameForClass(Class cls);
         } withCompletionBlock:nil];
       }
     }
-
-    /**
-     * TODO(tadeu): Remove it once and for all
-     */
-    for (id<RCTComponent> node in _bridgeTransactionListeners) {
-      [node reactBridgeDidFinishTransaction];
-    }
   };
 }
 
@@ -908,6 +901,14 @@ RCT_EXPORT_METHOD(findSubviewIn:(nonnull NSNumber *)reactTag atPoint:(CGPoint)po
       for (dispatch_block_t block in previousPendingUIBlocks) {
         block();
       }
+      /**
+       * TODO(tadeu): Remove it once and for all
+       */
+      if (previousPendingUIBlocks.count) {
+        for (id<RCTComponent> node in _bridgeTransactionListeners) {
+          [node reactBridgeDidFinishTransaction];
+        }
+      }
     }
     @catch (NSException *exception) {
       RCTLogError(@"Exception thrown while executing UI block: %@", exception);