diff --git a/lib/core/table/TableStorageManager.js b/lib/core/table/TableStorageManager.js
index e1b8d5c..ed5c36e 100644
--- a/lib/core/table/TableStorageManager.js
+++ b/lib/core/table/TableStorageManager.js
@@ -139,13 +139,13 @@ class TableStorageManager {
 
         // A property cannot be removed with a Merge Entity operation (in contrast to an update operation).
         for (const key of Object.keys(entity.attribs)) {
-            if (entity[key]) {
+            if (entity.attribs[key]) {
                 res.attribs[key] = entity.attribs[key];
             }
         }
         res.odata = entity.odata;
         coll.update(res);
-        return new EntityProxy(res);
+        return BbPromise.resolve(new AzuriteTableResponse({ proxy: new EntityProxy(res) }));
     }
 
     _getTable(name) {