diff --git a/field_sql_norevisions.module b/field_sql_norevisions.module
index 1741abc..8a996a2 100644
--- a/field_sql_norevisions.module
+++ b/field_sql_norevisions.module
@@ -239,15 +239,14 @@ function field_sql_norevisions_field_storage_load($entity_type, $entities, $age,
  */
 function field_sql_norevisions_field_storage_write($entity_type, $entity, $op, $fields) {
   $enabled_entity_bundles = variable_get('field_sql_norevisions_enabled_entities', array());
-  $entity_info = entity_get_info($entity_type);
-
-  if(empty($enabled_entity_bundles['field_sql_norevisions_' . $entity_type .'_' . $entity->{$entity_info['entity keys']['bundle']} . '_enabled'])) {
+  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
+  
+  if(empty($enabled_entity_bundles['field_sql_norevisions_' . $entity_type .'_' . $bundle . '_enabled'])) {
     //We fall back to normal SQL storage function
     field_sql_storage_field_storage_write($entity_type, $entity, $op, $fields);
     return;
   }
 
-  list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
   if (!isset($vid)) {
     $vid = $id;
   }