diff --git a/application/Espo/SelectManagers/Email.php b/application/Espo/SelectManagers/Email.php
index 58d9e52574..2be0e7e689 100644
--- a/application/Espo/SelectManagers/Email.php
+++ b/application/Espo/SelectManagers/Email.php
@@ -75,7 +75,7 @@ class Email extends \Espo\Core\SelectManagers\Base
                 $skipIndex = true;
             }
 
-            $actualDatabaseType = $this->getConfig()->get('actualDatabaseType');
+            /*$actualDatabaseType = strtolower($this->getConfig()->get('actualDatabaseType'));
             $actualDatabaseVersion = $this->getConfig()->get('actualDatabaseVersion');
 
             if (
@@ -84,7 +84,12 @@ class Email extends \Espo\Core\SelectManagers\Base
                 $this->hasLinkJoined('teams', $result)
             ) {
                 $skipIndex = true;
+            }*/
+
+            if ($this->hasLinkJoined('teams', $result)) {
+                $skipIndex = true;
             }
+
             if (!$skipIndex) {
                 $result['useIndex'] = 'dateSent';
             }