diff --git a/includes/entityqueue.admin.inc b/includes/entityqueue.admin.inc
index ae29ff9..8324ac3 100644
--- a/includes/entityqueue.admin.inc
+++ b/includes/entityqueue.admin.inc
@@ -372,6 +372,13 @@ function entityqueue_form($form, &$form_state, $queue, $op = 'edit') {
     '#default_value' => !empty($queue->data['max_size'])? $queue->data['max_size'] : 0,
   );
 
+  $form['data']['export_items'] = array(
+    '#title' => t('Export queue items'),
+    '#description' => t('Include queue items when exporting this entity queue.'),
+    '#type' => 'checkbox',
+    '#default_value' => empty($queue->data['export_items']) ? FALSE : TRUE,
+  );
+
   $form['actions'] = array('#type' => 'actions');
   $form['actions']['submit'] = array(
     '#type' => 'submit',
diff --git a/includes/entityqueue.controller.inc b/includes/entityqueue.controller.inc
index ad0e162..6d9f38b 100644
--- a/includes/entityqueue.controller.inc
+++ b/includes/entityqueue.controller.inc
@@ -36,4 +36,26 @@ class EntityQueueEntityController extends EntityAPIControllerExportable {
 
     return parent::create($values);
   }
+
+  /**
+   * Overridden.
+   */
+  public function export($entity, $prefix = '') {
+    $vars = get_object_vars($entity);
+    unset($vars[$this->statusKey], $vars[$this->moduleKey], $vars['is_new']);
+    if ($this->nameKey != $this->idKey) {
+      unset($vars[$this->idKey]);
+    }
+
+    // Do not export queue items.
+    if (empty($entity->data['export_items'])) {
+      foreach (element_children($vars) as $key) {
+        if (substr($key, 0, 3) == 'eq_') {
+          unset($vars[$key]);
+        }
+      }
+    }
+
+    return entity_var_json_export($vars, $prefix);
+  }
 }
diff --git a/plugins/entityreference/selection/EntityReference_SelectionHandler_EntityQueue.class.php b/plugins/entityreference/selection/EntityReference_SelectionHandler_EntityQueue.class.php
index 6a84423..21fd341 100644
--- a/plugins/entityreference/selection/EntityReference_SelectionHandler_EntityQueue.class.php
+++ b/plugins/entityreference/selection/EntityReference_SelectionHandler_EntityQueue.class.php
@@ -8,7 +8,7 @@ class EntityReference_SelectionHandler_EntityQueue extends EntityReference_Selec
   /**
    * Overrides EntityReference_SelectionHandler_Generic::getInstance().
    */
-  public static function getInstance($field, $instance) {
+  public static function getInstance($field, $instance = NULL, $entity_type = NULL, $entity = NULL) {
     return new EntityReference_SelectionHandler_EntityQueue($field, $instance);
   }