diff --git a/application/Espo/ORM/DB/Query/Base.php b/application/Espo/ORM/DB/Query/Base.php
index e910a236c2..9a1f74fa67 100644
--- a/application/Espo/ORM/DB/Query/Base.php
+++ b/application/Espo/ORM/DB/Query/Base.php
@@ -448,7 +448,7 @@ abstract class Base
                         if (!empty($fieldDefs['select'])) {
                             $part = $fieldDefs['select'];
                         } else {
-                            if (!empty($fieldDefs['notStorable'])) {
+                            if (!empty($fieldDefs['notStorable']) || !empty($fieldDefs['noSelect'])) {
                                 continue;
                             }
                             $part = $this->getFieldPath($entity, $attribute[0]);