diff --git a/app/observers/note_observer.rb b/app/observers/note_observer.rb
index 3f6d1dfc..4ee9fadf 100644
--- a/app/observers/note_observer.rb
+++ b/app/observers/note_observer.rb
@@ -11,7 +11,9 @@ class NoteObserver < ActiveRecord::Observer
       notify_team(note)
     elsif note.notify_author
       # Notify only author of resource
-      Notify.delay.note_commit_email(note.commit_author.id, note.id)
+      if note.commit_author
+        Notify.delay.note_commit_email(note.commit_author.id, note.id)
+      end
     else
       # Otherwise ignore it
       nil