1 files changed, 8 insertions, 1 deletions
diff --git a/app/models/concerns/diff_positionable_note.rb b/app/models/concerns/diff_positionable_note.rb
index b13ca4bf06e..051158e5de5 100644
--- a/app/models/concerns/diff_positionable_note.rb
+++ b/app/models/concerns/diff_positionable_note.rb
@@ -3,7 +3,6 @@ module DiffPositionableNote
   extend ActiveSupport::Concern
 
   included do
-    delegate :on_text?, :on_image?, to: :position, allow_nil: true
     before_validation :set_original_position, on: :create
     before_validation :update_position, on: :create, if: :on_text?, unless: :importing?
 
@@ -34,6 +33,14 @@ module DiffPositionableNote
     end
   end
 
+  def on_text?
+    !!position&.on_text?
+  end
+
+  def on_image?
+    !!position&.on_image?
+  end
+
   def supported?
     for_commit? || self.noteable.has_complete_diff_refs?
   end