diff --git a/docroot/sites/all/modules/contrib/ers/plugins/entity/ERSEntityDefault.class.php b/docroot/sites/all/modules/contrib/ers/plugins/entity/ERSEntityDefault.class.php
index 421d46b..4ad9cb8 100644
--- a/docroot/sites/all/modules/contrib/ers/plugins/entity/ERSEntityDefault.class.php
+++ b/docroot/sites/all/modules/contrib/ers/plugins/entity/ERSEntityDefault.class.php
@@ -439,7 +439,7 @@ class ERSEntityDefault implements ERSEntityInterface {
     // writes to both the 'current' and 'revision' tables, and has no concept of
     // draft revisions. To avoid stale/incorrect data in those tables, delete
     // any values that don't belong to the published revision ID.
-    if (!empty($entity->published_revision_id) &&  $entity->published_revision_id != $revision_id) {
+    if (!empty($entity->published_revision_id) && empty($entity->stateflow_ignore_state) && $entity->published_revision_id != $entity->draft_revision_id && $entity->published_revision_id != $revision_id) {
       foreach (field_info_instances('node', $bundle) as $instance) {
         $field = field_info_field($instance['field_name']);
         if (!empty($field['translatable']) && isset($field['storage']['details']['sql'][FIELD_LOAD_CURRENT])) {