diff --git a/client/src/components/rooms/RoomEntry.vue b/client/src/components/rooms/RoomEntry.vue
index a440156f..715651fb 100644
--- a/client/src/components/rooms/RoomEntry.vue
+++ b/client/src/components/rooms/RoomEntry.vue
@@ -32,9 +32,17 @@
         return '';
       },
       teaser() {
-        // if (this.contents && this.contents.length) {
-        //   if (this.contents[0].type === 'link')
-        // }
+        if (this.contents && this.contents.length) {
+          let first = this.contents.find(content => content.type !== 'image_url');
+          switch (first.type) {
+            case 'text_block':
+              return first.value.text;
+            case 'link_block':
+              return first.value.url;
+            default:
+              return ''
+          }
+        }
         return '';
       }
     }