diff --git a/engine/lib/views.php b/engine/lib/views.php
index 30556c3b994..b3c1b2b8857 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -872,8 +872,7 @@ function elgg_view_entity(ElggEntity $entity, $vars = array(), $bypass = true, $
 	$contents = '';
 	if (elgg_view_exists("$entity_type/$subtype")) {
 		$contents = elgg_view("$entity_type/$subtype", $vars, $bypass, $debug);
-	}
-	if (empty($contents)) {
+	} else {
 		$contents = elgg_view("$entity_type/default", $vars, $bypass, $debug);
 	}
 
diff --git a/views/json/export/entity.php b/views/json/export/entity.php
index 36af5eaef7d..02f4e32d893 100644
--- a/views/json/export/entity.php
+++ b/views/json/export/entity.php
@@ -21,5 +21,3 @@
 global $jsonexport;
 $jsonexport[$entity->getType()][$entity->getSubtype()][] = $export;
 
-// @todo hack to fix #4504
-echo "Fix for bug #4504";