diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 160686804..6a462b019 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -526,7 +526,11 @@ function handleUserChanges(client, message)
             if(ERR(err, callback)) return;
             
             changeset = Changeset.follow(c, changeset, false, apool);
-            callback(null);
+            if ((r - baseRev) % 200 == 0) { // don't let the stack get too deep
+              async.nextTick(callback);
+            } else {
+              callback(null);
+            }
           });
         },
         //use the callback of the series function