diff --git a/src/components/EntityScreen/EntityContent.jsx b/src/components/EntityScreen/EntityContent.jsx
index cc91981..31a45f8 100644
--- a/src/components/EntityScreen/EntityContent.jsx
+++ b/src/components/EntityScreen/EntityContent.jsx
@@ -4,11 +4,11 @@ import DualPane from 'components/common/DualPane';
 
 class EntityContent extends Component {
   render() {
-    const { entity } = this.props;
+    const { properties = {} } = this.props.entity;
     return (
       <DualPane.ContentPane>
         <dl>
-          {Object.entries(entity.properties).map(([property, values]) => ([
+          {Object.entries(properties).map(([property, values]) => ([
             <dt>{property}</dt>,
             <dd>
               {values.length === 1
diff --git a/src/components/EntityScreen/EntityInfo.jsx b/src/components/EntityScreen/EntityInfo.jsx
index 1a0bd00..91f18d0 100644
--- a/src/components/EntityScreen/EntityInfo.jsx
+++ b/src/components/EntityScreen/EntityInfo.jsx
@@ -4,14 +4,14 @@ import DualPane from 'components/common/DualPane';
 
 class EntityInfo extends Component {
   render() {
-    const { entity } = this.props;
+    const { name, schema, created_at, countries = [] } = this.props.entity;
     return (
       <DualPane.InfoPane>
-        <h1>{entity.name}</h1>
+        <h1>{name}</h1>
         <ul>
-          <li>{entity.schema}</li>
-          <li>{entity.created_at}</li>
-          <li>{entity.countries.join(', ')}</li>
+          <li>{schema}</li>
+          <li>{created_at}</li>
+          <li>{countries.join(', ')}</li>
         </ul>
       </DualPane.InfoPane>
     );