diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
index 0e2b12910ac..f1c2e7e06d9 100644
--- a/lib/datastore/entity.js
+++ b/lib/datastore/entity.js
@@ -269,7 +269,7 @@ var queryToQueryProto = function(q) {
       if (f.name === '__key__') {
         val.keyValue = keyToKeyProto(null, f.val);
       } else {
-        val.properties = valueToProperty(f.val);
+        val = valueToProperty(f.val);
       }
       var property = {
         property: { name: f.name },
diff --git a/test/datastore.entity.js b/test/datastore.entity.js
index c69dde230db..6986cb83e2d 100644
--- a/test/datastore.entity.js
+++ b/test/datastore.entity.js
@@ -282,9 +282,7 @@ var queryFilterProto = {
                     },
                     "operator": "EQUAL",
                     "value": {
-                        "properties": {
-                            "stringValue": "John"
-                        }
+                        "stringValue": "John"
                     }
                 }
             }, {
diff --git a/test/testdata/proto_query.json b/test/testdata/proto_query.json
index e1450d3857b..7b6f5110a55 100644
--- a/test/testdata/proto_query.json
+++ b/test/testdata/proto_query.json
@@ -1 +1 @@
-{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"properties":{"integerValue":5}}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"properties":{"stringValue":"Burcu"}}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}
+{"projection":[{"property":{"name":"name"}},{"property":{"name":"count"}}],"kinds":[{"name":"Kind"}],"filter":{"compositeFilter":{"filters":[{"propertyFilter":{"property":{"name":"count"},"operator":"GREATER_THAN_OR_EQUAL","value":{"integerValue":5}}},{"propertyFilter":{"property":{"name":"name"},"operator":"EQUAL","value":{"stringValue":"Burcu"}}}],"operator":"AND"}},"order":[{"property":{"name":"count"},"direction":"DESCENDING"}],"groupBy":[{"name":"count"}],"startCursor":"cursor","offset":5,"limit":10}