diff --git a/include/class.ticket.php b/include/class.ticket.php
index f2d60bd4ce52875438a968e21dfaf04471268865..a017a7b575a20a8a61e01104fe9996d6567ce8b3 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2711,7 +2711,9 @@ class Ticket {
             if ($vars['staffId'])
                  $ticket->assignToStaff($vars['staffId'], _S('Auto Assignment'));
             if ($vars['teamId'])
-                $ticket->assignToTeam($vars['teamId'], _S('Auto Assignment'));
+                // No team alert if also assigned to an individual agent
+                $ticket->assignToTeam($vars['teamId'], _S('Auto Assignment'),
+                    !$vars['staffId']);
         }
 
         // Apply requested status — this should be done AFTER assignment,