diff --git a/basic_ds.go b/basic_ds.go
index ccfe14d91346c23a09a5c4d51abc2d16260355dd..19b74e26c9143ff4a9d7ff8c8c3b1876b3e8217d 100644
--- a/basic_ds.go
+++ b/basic_ds.go
@@ -64,7 +64,11 @@ func (d *MapDatastore) Delete(key Key) (err error) {
 func (d *MapDatastore) Query(q dsq.Query) (dsq.Results, error) {
 	re := make([]dsq.Entry, 0, len(d.values))
 	for k, v := range d.values {
-		re = append(re, dsq.Entry{Key: k.String(), Value: v})
+		e := dsq.Entry{Key: k.String()}
+		if !q.KeysOnly {
+			e.Value = v
+		}
+		re = append(re, e)
 	}
 	r := dsq.ResultsWithEntries(q, re)
 	r = dsq.NaiveQueryApply(q, r)