diff --git a/go/src/v.io/x/sensorlog/internal/client/list.go b/go/src/v.io/x/sensorlog/internal/client/list.go
index 04f1ea8..d21cb8b 100644
--- a/go/src/v.io/x/sensorlog/internal/client/list.go
+++ b/go/src/v.io/x/sensorlog/internal/client/list.go
@@ -74,6 +74,9 @@
 	trans := make([]*dataPoint, 0, 16)
 	for ws.Advance() {
 		c := ws.Change()
+		if c.EntityType != syncbase.EntityRow {
+			continue
+		}
 		var elem dataPoint
 		if err := elem.Key.Parse(c.Row); err != nil {
 			return fmt.Errorf("invalid DataPoint key for prefix %s: %v", dataPrefix, err)
diff --git a/go/src/v.io/x/sensorlog/internal/measure/watcher.go b/go/src/v.io/x/sensorlog/internal/measure/watcher.go
index e9776c0..bf59a10 100644
--- a/go/src/v.io/x/sensorlog/internal/measure/watcher.go
+++ b/go/src/v.io/x/sensorlog/internal/measure/watcher.go
@@ -40,6 +40,9 @@
 
 	for ws.Advance() {
 		c := ws.Change()
+		if c.EntityType != syncbase.EntityRow {
+			continue
+		}
 		key := &sbmodel.KStreamDef{}
 		if err := key.Parse(c.Row); err != nil {
 			return fmt.Errorf("invalid StreamDef key for prefix %s: %v", watchPrefix, err)