diff --git a/ctools/content_types/entity_view.inc b/ctools/content_types/entity_view.inc
index e505633..db69d23 100644
--- a/ctools/content_types/entity_view.inc
+++ b/ctools/content_types/entity_view.inc
@@ -113,8 +113,13 @@ function entity_entity_view_content_type_render($entity_type, $conf, $panel_args
   $block->delta = $entity_type . '-' . str_replace('-', '_', $conf['view_mode']);
 
   $entity_id = $context->argument;
-  $entity = entity_load_single($entity_type, $entity_id);
-  $block->content = entity_view($entity_type, array($entity_id => $entity), $conf['view_mode']);
+  $entity = isset($context->data) ? clone($context->data) : NULL;
+  if (empty($entity)) {
+    $block->content = '';
+  }
+  else {
+    $block->content = entity_view($entity_type, array($entity_id => $entity), $conf['view_mode']);
+  }
   return $block;
 }