diff --git a/avatar/views.py b/avatar/views.py
index df2a5fb..ebe9022 100644
--- a/avatar/views.py
+++ b/avatar/views.py
@@ -138,7 +138,8 @@ def delete(request, extra_context={}, next_override=None):
                     if unicode(a.id) not in ids:
                         a.primary = True
                         a.save()
-                        _notification_updated(request, a)
+                        if notification:
+                            _notification_updated(request, a)
                         break
             Avatar.objects.filter(id__in=ids).delete()
             request.user.message_set.create(