diff --git a/panelizer.install b/panelizer.install
index 2a732a8..51d5fe6 100644
--- a/panelizer.install
+++ b/panelizer.install
@@ -255,6 +255,13 @@ function panelizer_schema_4() {
   return $schema;
 }
 
+function panelizer_schema_5() {
+  $schema = panelizer_schema_4();
+  $schema['panelizer_entity']['indexes']['revision_id'] = array('revision_id');
+
+  return $schema;
+}
+
 /**
  * Implements hook_install().
  */
@@ -1157,3 +1164,11 @@ function panelizer_update_7121() {
     }
   }
 }
+
+/**
+ * Add an index to panelizer entity revision ids.
+ */
+function panelizer_update_7122() {
+  $schema = panelizer_schema_5();
+  db_add_index('panelizer_entity', 'revision_id', $schema['panelizer_entity']['indexes']['revision_id']);
+}
diff --git a/plugins/entity/PanelizerEntityDefault.class.php b/plugins/entity/PanelizerEntityDefault.class.php
index a113f52..7f47740 100644
--- a/plugins/entity/PanelizerEntityDefault.class.php
+++ b/plugins/entity/PanelizerEntityDefault.class.php
@@ -1423,7 +1423,7 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface {
 
     // Load all the panelizers associated with the list of entities.
     if ($this->supports_revisions) {
-      $result = db_query("SELECT * FROM {panelizer_entity} WHERE entity_type = :entity_type AND entity_id IN (:ids) AND revision_id IN (:vids)", array(':entity_type' => $this->entity_type, ':ids' => $ids, ':vids' => $vids));
+      $result = db_query("SELECT * FROM {panelizer_entity} WHERE entity_type = :entity_type AND revision_id IN (:vids)", array(':entity_type' => $this->entity_type, ':vids' => $vids));
     }
     else {
       $result = db_query("SELECT * FROM {panelizer_entity} WHERE entity_type = :entity_type AND entity_id IN (:ids)", array(':entity_type' => $this->entity_type, ':ids' => $ids));