diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm index cc6c23187..42b8bfe6b 100644 --- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm +++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin/FlipperKitLayoutPlugin.mm @@ -164,10 +164,15 @@ } - (void)didDisconnect { - // Clear the last highlight if there is any - [self onCallSetHighlighted:nil withResponder:nil]; - // Disable search if it is active - [self onCallSetSearchActive:NO withConnection:nil]; + // removeFromSuperlayer (SKHighlightOverlay) needs to be called on main thread + FlipperPerformBlockOnMainThread( + ^{ + // Clear the last highlight if there is any + [self onCallSetHighlighted:nil withResponder:nil]; + // Disable search if it is active + [self onCallSetSearchActive:NO withConnection:nil]; + }, + nil); } - (void)onCallGetRoot:(id)responder {