1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/diff_positionable_note.rb b/app/models/concerns/diff_positionable_note.rb
index 6484a3157b1..cea3c7d119c 100644
--- a/app/models/concerns/diff_positionable_note.rb
+++ b/app/models/concerns/diff_positionable_note.rb
@@ -17,12 +17,14 @@ module DiffPositionableNote
   %i(original_position position change_position).each do |meth|
     define_method "#{meth}=" do |new_position|
       if new_position.is_a?(String)
-        new_position = JSON.parse(new_position) rescue nil
+        new_position = Gitlab::Json.parse(new_position) rescue nil
       end
 
       if new_position.is_a?(Hash)
         new_position = new_position.with_indifferent_access
         new_position = Gitlab::Diff::Position.new(new_position)
+      elsif !new_position.is_a?(Gitlab::Diff::Position)
+        new_position = nil
       end
 
       return if new_position == read_attribute(meth)