diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php
index 35f065757b3d..153a9d65d21a 100644
--- a/app/Utils/Traits/Notifications/UserNotifies.php
+++ b/app/Utils/Traits/Notifications/UserNotifies.php
@@ -33,7 +33,7 @@ trait UserNotifies
         $notifiable_methods = [];
         $notifications = $company_user->notifications;
 
-        if ($invitation->company->is_disabled &&
+        if ($company_user->company->is_disabled &&
             is_array($notifications->email) ||
             $company_user->trashed() ||
             ! $company_user->user ||
@@ -43,7 +43,7 @@ trait UserNotifies
 
         //if a user owns this record or is assigned to it, they are attached the permission for notification.
         if ($invitation->{$entity_name}->user_id == $company_user->user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
-            // $required_permissions = $this->addSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
+            
         } else {
             $required_permissions = $this->removeSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
         }
@@ -60,7 +60,7 @@ trait UserNotifies
         $notifiable_methods = [];
         $notifications = $company_user->notifications;
 
-        if ($entity->company->is_disabled ||
+        if ($company_user->company->is_disabled ||
             ! $notifications ||
             $company_user->trashed() ||
             ! $company_user->user ||
@@ -84,23 +84,6 @@ trait UserNotifies
     private function addSpecialUserPermissionForEntity($entity, array $required_permissions) :array
     {
         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications']);
-
-        // switch ($entity) {
-        //     case $entity instanceof Payment || $entity instanceof Client: //we pass client also as this is the proxy for Payment Failures (ie, there is no payment)
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'payment_failure_user', 'payment_success_user']);
-        //     case $entity instanceof Invoice:
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'invoice_created_user', 'invoice_sent_user', 'invoice_viewed_user', 'invoice_late_user']);
-        //     case $entity instanceof Quote:
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'quote_created_user', 'quote_sent_user', 'quote_viewed_user', 'quote_approved_user', 'quote_expired_user']);
-        //     case $entity instanceof Credit:
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'credit_created_user', 'credit_sent_user', 'credit_viewed_user']);
-        //     case $entity instanceof PurchaseOrder:
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'purchase_order_created_user', 'purchase_order_sent_user', 'purchase_order_viewed_user']);
-        //     case $entity instanceof Product:
-        //         return array_merge($required_permissions, ['all_notifications', 'all_user_notifications', 'inventory_user', 'inventory_all']);
-        //     default:
-        //         return [];
-        // }
     }
 
     private function removeSpecialUserPermissionForEntity($entity, $required_permissions)