diff --git a/lib/src/main/java/io/v/v23/syncbase/DatabaseImpl.java b/lib/src/main/java/io/v/v23/syncbase/DatabaseImpl.java
index b0bf6bb..a9f02ab 100644
--- a/lib/src/main/java/io/v/v23/syncbase/DatabaseImpl.java
+++ b/lib/src/main/java/io/v/v23/syncbase/DatabaseImpl.java
@@ -199,6 +199,14 @@
                 new InputChannels.TransformFunction<Change, WatchChange>() {
                     @Override
                     public WatchChange apply(Change change) throws VException {
+                        if (change.getState()
+                                == io.v.v23.services.watch.Constants.INITIAL_STATE_SKIPPED) {
+                            return null;
+                        }
+                        if (!change.getName().contains("/")) {
+                            // TODO(ivanpi): Pipe collection and initial changes through.
+                            return null;
+                        }
                         return convertToWatchChange(change);
                     }
                 });