Index: docroot/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.features.inc
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- docroot/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.features.inc	(revision 1c099f31968c436115efe82fe4785916947c36d0)
+++ docroot/sites/all/modules/contrib/conditional_fields/includes/conditional_fields.features.inc	(revision )
@@ -63,12 +63,14 @@
           if (variable_get('c_fields_uuid', FALSE) && $dependee['options']['condition'] == 'value' && $dependee['options']['values_set'] == CONDITIONAL_FIELDS_DEPENDENCY_VALUES_WIDGET) {
             // Load the field info to get the referenced entity type.
             $field_info = field_info_field($dependee['dependee']);
-
+            // We try to get the uuid of the target, otherwise we don't override the default value.
+            if ($uuid = current(entity_get_uuid_by_id($field_info['settings']['target_type'], array($dependee['options']['value'][0]['target_id'])))) {
-            // Store the uuid of the select entity.
+              // Store the uuid of the select entity.
-            $dependee['options']['value'][0]['target_uuid'] = $dependee['options']['value_form'] = current(entity_get_uuid_by_id($field_info['settings']['target_type'], array($dependee['options']['value'][0]['target_id'])));
+              $dependee['options']['value'][0]['target_uuid'] = $dependee['options']['value_form'] = $uuid;
 
-            // Unset the normal stored value.
-            unset($dependee['options']['value'][0]['target_id']);
+              // Unset the normal stored value.
+              unset($dependee['options']['value'][0]['target_id']);
+            }
           }
 
           $code[] = '';