diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index 854bb1c61..98357e96e 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -79,7 +79,8 @@ class CommentsController < ApplicationController
 
     def add_notification(comment)
       notifiable = comment.reply? ? comment.parent : comment.commentable
-      if notifiable&.author_id.present? && notifiable.author_id != comment.author_id
+      notifiable_author_id = notifiable.try(:author_id)
+      if notifiable_author_id.present? && notifiable_author_id != comment.author_id
         Notification.add(notifiable.author_id, notifiable)
       end
     end