diff --git a/src/Handler/Firm.hs b/src/Handler/Firm.hs
index a37f59caa..479b2009f 100644
--- a/src/Handler/Firm.hs
+++ b/src/Handler/Firm.hs
@@ -845,7 +845,8 @@ mkFirmSuperTable isAdmin cid = do
       where
         dbtSQLQuery = \(usr `E.LeftOuterJoin` usrCmp) -> do
           EL.on $ usr E.^. UserId E.=?. usrCmp E.?. UserCompanyUser E.&&. usrCmp E.?. UserCompanyCompany E.?=. E.val cid
-          E.where_ $ E.exists $ firmQuerySupervisedBy cid Nothing usr
+          E.where_ $ E.isTrue (usrCmp E.?. UserCompanySupervisor)
+              E.||.  E.exists (firmQuerySupervisedBy cid Nothing usr)
           return ( usr
                  , usr & firmCountForSupervisor cid Nothing
                  , usr & firmCountForSupervisor cid (Just (E.^. UserSupervisorRerouteNotifications))