diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/Astrid44SyncMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/Astrid44SyncMigrator.java
index 691249e80..65777954a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/Astrid44SyncMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/Astrid44SyncMigrator.java
@@ -49,6 +49,7 @@ public class Astrid44SyncMigrator {
         // --------------
         Query noTagDataQuery = Query.select(Metadata.PROPERTIES).where(Criterion.and(
                 MetadataCriteria.withKey(TagMetadata.KEY),
+                Criterion.or(TagMetadata.TAG_UUID.isNull(), TagMetadata.TAG_UUID.eq(0)),
                 Criterion.not(TagMetadata.TAG_NAME.in(Query.select(TagData.NAME).from(TagData.TABLE))))).groupBy(TagMetadata.TAG_NAME);
 
         TodorooCursor<Metadata> noTagData = metadataService.query(noTagDataQuery);