diff --git a/exec/load/json-client.js b/exec/load/json-client.js
index 4e3201ae6ad421874c21e4eac69c3d5dcb72b692..3771bf63985c8e8600ee78c0d2f12d19de71a069 100644
--- a/exec/load/json-client.js
+++ b/exec/load/json-client.js
@@ -296,7 +296,7 @@ function JSONClient(serverAddr,serverPort) {
         this.send({
 			scope:scope,
 			func:"QUERY",
-			oper:"WRITE",
+			oper:"DELETE",
             location:location,
 			data:undefined,
 			lock:lock,
diff --git a/exec/load/json-db.js b/exec/load/json-db.js
index 32d38528c4919e7b303beef178582a67f4a6c128..af00da9a8c95b13fb8dad56590499e6507908b07 100644
--- a/exec/load/json-db.js
+++ b/exec/load/json-db.js
@@ -498,9 +498,12 @@ function JSONdb (fileName, scope) {
     /* remove a record from the database (requires WRITE_LOCK) */
     this.remove = function(request,record) {
 		var client = request.client;
+		
 		/* if the requested data does not exist, do nothing */
-		if(record.data === undefined) 
+		if(record.data === undefined || !record.data.hasOwnProperty(record.property)) {
 			return true;
+		}
+		
 		/* if this client has this record locked */
 		else if(record.shadow[record.property]._lock[client.id] && 
 			record.shadow[record.property]._lock[client.id].type == locks.WRITE) {