diff --git a/src/core/service/api/ui/create-selector-query.js b/src/core/service/api/ui/create-selector-query.js
index 06243900425bc387dbb502afc33047f456b81321..37c6fe4ffd8e03d2b0a85cc4bd9ce0b333a70e56 100644
--- a/src/core/service/api/ui/create-selector-query.js
+++ b/src/core/service/api/ui/create-selector-query.js
@@ -92,6 +92,7 @@ class SelectorQuery {
     this._page = page
     this._queue = []
     this._queueCb = []
+    this._nodesRef = null
   }
 
   exec (callback) {
@@ -110,6 +111,8 @@ class SelectorQuery {
       })
       isFn(callback) && callback.call(this, res)
     })
+
+    return this._nodesRef
   }
 
   ['in'] (component) {
@@ -119,15 +122,15 @@ class SelectorQuery {
   }
 
   select (selector) {
-    return new NodesRef(this, this._component, selector, true)
+    return (this._nodesRef = new NodesRef(this, this._component, selector, true))
   }
 
   selectAll (selector) {
-    return new NodesRef(this, this._component, selector, false)
+    return (this._nodesRef = new NodesRef(this, this._component, selector, false))
   }
 
   selectViewport () {
-    return new NodesRef(this, 0, '', true)
+    return (this._nodesRef = new NodesRef(this, 0, '', true))
   }
 
   _push (selector, component, single, fields, callback) {