diff --git a/src/MatrixClientPeg.js b/src/MatrixClientPeg.js
index 82d18d307d..f5872812de 100644
--- a/src/MatrixClientPeg.js
+++ b/src/MatrixClientPeg.js
@@ -34,14 +34,6 @@ interface MatrixClientCreds {
     guest: boolean,
 }
 
-const FILTER_CONTENT = {
-    room: {
-        state: {
-            lazy_load_members: true,
-        },
-    },
-};
-
 /**
  * Wrapper object for handling the js-sdk Matrix Client object in the react-sdk
  * Handles the creation/initialisation of client objects.
@@ -108,7 +100,7 @@ class MatrixClientPeg {
         opts.pendingEventOrdering = "detached";
 
         if (SettingsStore.isFeatureEnabled('feature_lazyloading')) {
-            opts.filter = await this.matrixClient.createFilter(FILTER_CONTENT);
+            opts.lazyLoadMembers = true;
         }
 
         try {
@@ -127,7 +119,7 @@ class MatrixClientPeg {
         MatrixActionCreators.start(this.matrixClient);
 
         console.log(`MatrixClientPeg: really starting MatrixClient`);
-        this.get().startClient(opts);
+        await this.get().startClient(opts);
         console.log(`MatrixClientPeg: MatrixClient started`);
     }
 
diff --git a/src/components/views/elements/Pill.js b/src/components/views/elements/Pill.js
index f3b6d4e32a..e06ed5a22f 100644
--- a/src/components/views/elements/Pill.js
+++ b/src/components/views/elements/Pill.js
@@ -187,6 +187,9 @@ const Pill = React.createClass({
                 getContent: () => {
                     return {avatar_url: resp.avatar_url};
                 },
+                getDirectionalContent: function() {
+                    return this.getContent();
+                },
             };
             this.setState({member});
         }).catch((err) => {