diff --git a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
index 9fe8bb1cd..89a1abe28 100644
--- a/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
+++ b/iOS/Plugins/FlipperKitLayoutPlugin/FlipperKitLayoutComponentKitSupport/CKComponent+Sonar.mm
@@ -38,11 +38,6 @@
     sonar_additionalDataOverride;
 @end
 
-static BOOL AccessibilityContextIsDefault(
-    CKComponentAccessibilityContext accessibilityContext) {
-  return accessibilityContext == CKComponentAccessibilityContext();
-}
-
 static NSDictionary<NSString*, NSObject*>* AccessibilityContextDict(
     CKComponentAccessibilityContext accessibilityContext) {
   NSMutableDictionary<NSString*, NSObject*>* accessibilityDict =
@@ -234,16 +229,16 @@ static CK::StaticMutex _mutex = CK_MUTEX_INITIALIZER;
   // Only add accessibility panel if accessibilityContext is not default
   CKComponentAccessibilityContext accessibilityContext =
       [self viewConfiguration].accessibilityContext();
-  if (!AccessibilityContextIsDefault(accessibilityContext)) {
-    [data addObject:[SKNamed
-                        newWithName:@"Accessibility"
-                          withValue:@{
-                            @"accessibilityContext" :
-                                AccessibilityContextDict(accessibilityContext),
-                            @"accessibilityEnabled" : SKMutableObject(
-                                @(CK::Component::Accessibility::
-                                      IsAccessibilityEnabled())),
-                          }]];
+  NSDictionary* accessibilityDict =
+      AccessibilityContextDict(accessibilityContext);
+  if ([accessibilityDict count]) {
+    [data addObject:[SKNamed newWithName:@"Accessibility"
+                               withValue:@{
+                                 @"accessibilityContext" : accessibilityDict,
+                                 @"accessibilityEnabled" : SKMutableObject(
+                                     @(CK::Component::Accessibility::
+                                           IsAccessibilityEnabled())),
+                               }]];
   }
   if ([self respondsToSelector:@selector(sonar_additionalDataOverride)]) {
     [data addObjectsFromArray:[(id)self sonar_additionalDataOverride]];