diff --git a/apachesolr.module b/apachesolr.module
index 4faebb4..2dbf4dc 100644
--- a/apachesolr.module
+++ b/apachesolr.module
@@ -1501,7 +1501,9 @@ function apachesolr_entity_info_alter(&$entity_info) {
 
   // First set defaults so that we needn't worry about NULL keys.
   foreach (array_keys($entity_info) as $type) {
-    $entity_info[$type]['apachesolr'] = array();
+    if (!isset($entity_info[$type]['apachesolr'])) {
+      $entity_info[$type]['apachesolr'] = array();
+    }
     if (isset($default_entity_info[$type])) {
       $entity_info[$type]['apachesolr'] += $default_entity_info[$type];
     }
