diff --git a/common/src/main/java/com/box/l10n/mojito/okapi/filters/AndroidFilter.java b/common/src/main/java/com/box/l10n/mojito/okapi/filters/AndroidFilter.java
index 329f0ee4d9..af2e43caa0 100644
--- a/common/src/main/java/com/box/l10n/mojito/okapi/filters/AndroidFilter.java
+++ b/common/src/main/java/com/box/l10n/mojito/okapi/filters/AndroidFilter.java
@@ -198,7 +198,7 @@ protected void extractNoteFromXMLCommentInSkeletonIfNone(TextUnit textUnit) {
 
     String skeleton = textUnit.getSkeleton().toString();
 
-    if (textUnit.getProperty(NoteAnnotation.LOC_NOTE) == null) {
+    if (textUnitUtils.getNote(textUnit) == null) {
       String note = getNoteFromXMLCommentsInSkeleton(skeleton);
       if (note != null) {
         textUnitUtils.setNote(textUnit, note);