diff --git a/lib/persistence.search.js b/lib/persistence.search.js
index bf95dd0..7f5fd70 100644
--- a/lib/persistence.search.js
+++ b/lib/persistence.search.js
@@ -260,6 +260,9 @@ persistence.search.config = function(persistence, dialect) {
             for ( var p in obj._dirtyProperties) {
               if (obj._dirtyProperties.hasOwnProperty(p) && p in meta.textIndex) {
                 queries.push(['DELETE FROM `' + indexTbl + '` WHERE `entityId` = ? AND `prop` = ?', [id, p]]);
+                if (!(obj._data[p] && obj._data[p].length)) {
+                  continue;
+                }
                 var occurrences = searchTokenizer(obj._data[p]);
                 for(var word in occurrences) {
                   if(occurrences.hasOwnProperty(word)) {