diff --git a/lib/components/JsonSchema/json-schema-lazy.js b/lib/components/JsonSchema/json-schema-lazy.js
index a8c7b589..bbf20974 100644
--- a/lib/components/JsonSchema/json-schema-lazy.js
+++ b/lib/components/JsonSchema/json-schema-lazy.js
@@ -55,7 +55,8 @@ export default class JsonSchemaLazy {
           let $element = compRef.location.nativeElement;
 
           // skip caching view with tabs inside (discriminator) as it needs attached controller
-          if ($element.querySelector('tabs')) {
+          // FIXME: get rid of dependency on selector
+          if ($element.querySelector('.discriminator-wrap')) {
             this.dcl.loadNextToLocation(JsonSchema, this.elementRef).then((compRef) => {
               compRef.instance.pointer = this.pointer;
               compRef.hostView.changeDetectorRef.markForCheck();