diff --git a/uuid.entity.inc b/uuid.entity.inc
index 50081c3..a13b962 100644
--- a/uuid.entity.inc
+++ b/uuid.entity.inc
@@ -235,7 +235,7 @@ function entity_make_entity_local($entity_type, $entity) {
 
     // UUID entites must always provide a valid UUID when saving in order to do
     // the correct mapping between local and global IDs.
-    if (empty($entity->{$uuid_key}) || !uuid_is_valid($entity->{$uuid_key})) {
+    if (empty($entity->{$uuid_key}) || ($uuid_key == 'uuid' && !uuid_is_valid($entity->{$uuid_key}))) {
       throw new UuidEntityException(t('Trying to save a @type entity with empty or invalid UUID.', array('@type' => $info['label'])));
     }