diff --git a/lib/datastore/entity.js b/lib/datastore/entity.js
index e3e3c806034..0116d2d5e8d 100644
--- a/lib/datastore/entity.js
+++ b/lib/datastore/entity.js
@@ -359,7 +359,7 @@ function propertyToValue(property) {
     return property.string_value;
   }
   if (exists(property.blob_value)) {
-    return new Buffer(property.blob_value, 'base64');
+    return property.blob_value.toBuffer();
   }
   if (exists(property.timestamp_microseconds_value)) {
     var microSecs = parseInt(