diff --git a/examples/chat/model.js b/examples/chat/model.js
index <HASH>..<HASH> 100755
--- a/examples/chat/model.js
+++ b/examples/chat/model.js
@@ -61,8 +61,15 @@ function setup (channelHex, nick, onReady) {
       render(doc)
     }
 
-    // FIXME: Commit something to the document?
+    // Hack alert!!!!!
     hm.on('peer:joined', () => {
+      setTimeout(() => {
+        doc = hm.update(
+          Automerge.change(doc, changeDoc => {
+            changeDoc.messages[Date.now()] = {}
+          })
+        )
+      }, 1000)
     })
 
     // This callback is supplied to the onReady callback - it is used
diff --git a/examples/chat/ui.js b/examples/chat/ui.js
index <HASH>..<HASH> 100755
--- a/examples/chat/ui.js
+++ b/examples/chat/ui.js
@@ -37,7 +37,9 @@ function render (renderDoc) {
       if (joined) {
         displayMessages.push(`${nick} has joined.`)
       } else {
-        displayMessages.push(`${nick}: ${message}`)
+        if (message) {
+          displayMessages.push(`${nick}: ${message}`)
+        }
       }
     })
     // Delete old messages
Implement workaround for getting new peers into the document

Waiting on a timeout is not very nice, but it mostly works.