diff --git a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
index 1c4a3bc1..ab35b2e0 100644
--- a/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
+++ b/app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
@@ -242,8 +242,10 @@ constructor(protected val context: Context, protected val account: Account, prot
                     applyRemoteItems(itemList)
 
                     stoken = itemList.stoken
-                    synchronized(etebaseLocalCache) {
-                        etebaseLocalCache.collectionSaveStoken(cachedCollection.col.uid, stoken!!)
+                    if (stoken != null) {
+                        synchronized(etebaseLocalCache) {
+                            etebaseLocalCache.collectionSaveStoken(cachedCollection.col.uid, stoken)
+                        }
                     }
                 } while (!itemList!!.isDone)
             }