diff --git a/lib/connection.cpp b/lib/connection.cpp
index 26c337678..526093703 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -94,6 +94,7 @@ class Connection::Private
         bool cacheState = true;
         bool cacheToBinary = SettingsGroup("libqmatrixclient")
                              .value("cache_type").toString() != "json";
+        bool lazyLoading;
 
         void connectWithToken(const QString& user, const QString& accessToken,
                               const QString& deviceId);
@@ -287,11 +288,11 @@ void Connection::sync(int timeout)
     if (d->syncJob)
         return;
 
-    // Raw string: http://en.cppreference.com/w/cpp/language/string_literal
-    const auto filter =
-        QStringLiteral(R"({"room": { "timeline": { "limit": 100 } } })");
+    Filter filter;
+    filter.room->timeline->limit = 100;
+    filter.room->state->lazyLoadMembers = d->lazyLoading;
     auto job = d->syncJob = callApi<SyncJob>(BackgroundRequest,
-                                         d->data->lastEvent(), filter, timeout);
+                                d->data->lastEvent(), filter, timeout);
     connect( job, &SyncJob::success, this, [this, job] {
         onSyncSuccess(job->takeData());
         d->syncJob = nullptr;
@@ -1181,6 +1182,20 @@ void Connection::setCacheState(bool newValue)
     }
 }
 
+bool QMatrixClient::Connection::lazyLoading() const
+{
+    return d->lazyLoading;
+}
+
+void QMatrixClient::Connection::setLazyLoading(bool newValue)
+{
+    if (d->lazyLoading != newValue)
+    {
+        d->lazyLoading = newValue;
+        emit lazyLoadingChanged();
+    }
+}
+
 void Connection::getTurnServers()
 {
   auto job = callApi<GetTurnServerJob>();
diff --git a/lib/connection.h b/lib/connection.h
index 32533b6e7..220f6c8f1 100644
--- a/lib/connection.h
+++ b/lib/connection.h
@@ -122,6 +122,8 @@ namespace QMatrixClient
             Q_PROPERTY(QByteArray accessToken READ accessToken NOTIFY stateChanged)
             Q_PROPERTY(QUrl homeserver READ homeserver WRITE setHomeserver NOTIFY homeserverChanged)
             Q_PROPERTY(bool cacheState READ cacheState WRITE setCacheState NOTIFY cacheStateChanged)
+            Q_PROPERTY(bool lazyLoading READ lazyLoading WRITE setLazyLoading NOTIFY lazyLoadingChanged)
+
         public:
             // Room ids, rather than room pointers, are used in the direct chat
             // map types because the library keeps Invite rooms separate from
@@ -308,6 +310,9 @@ namespace QMatrixClient
             bool cacheState() const;
             void setCacheState(bool newValue);
 
+            bool lazyLoading() const;
+            void setLazyLoading(bool newValue);
+
             /** Start a job of a specified type with specified arguments and policy
              *
              * This is a universal method to start a job of a type passed
@@ -655,6 +660,7 @@ namespace QMatrixClient
                                          IgnoredUsersList removals);
 
             void cacheStateChanged();
+            void lazyLoadingChanged();
             void turnServersChanged(const QJsonObject& servers);
 
         protected: