diff --git a/source/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java b/source/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java
index 689d8ee49d..5226f1044f 100644
--- a/source/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java
+++ b/source/java/org/alfresco/repo/dictionary/M2PropertyDefinition.java
@@ -498,6 +498,11 @@ import org.alfresco.util.EqualsHelper;
             isUpdatedIncrementally = true;
         }
         
+        if (! EqualsHelper.nullSafeEquals(getIndexTokenisationMode().toString(), propDef.getIndexTokenisationMode().toString(), false))
+        { 
+            isUpdatedIncrementally = true;
+        }
+        
         
         // check override
         if (isOverride() != propDef.isOverride())
@@ -505,13 +510,6 @@ import org.alfresco.util.EqualsHelper;
             isUpdated = true;
         }
         
-        // check index tokenisation mode
-        if (! EqualsHelper.nullSafeEquals(getIndexTokenisationMode().toString(), propDef.getIndexTokenisationMode().toString(), false))
-        { 
-            isUpdated = true;
-        }
-        
-        
         // TODO - check prop constraints (inline and referenced)
         
         if (isUpdated)