diff --git a/src/client.js b/src/client.js
index 5effadb..9c211df 100644
--- a/src/client.js
+++ b/src/client.js
@@ -157,7 +157,7 @@ function processNoteFromUser(data) {
 }
 
 function checkIfRequestSatisfy(request, data) {
-    if (!request || request.mostRecent || request.receiverID !== data.receiverID)
+    if (!request || request.mostRecent || request.receiverID !== (data.proxyID || data.receiverID))
         return false;
     if (request.atVectorClock && request.atVectorClock !== data.vectorClock)
         return false;
diff --git a/src/database.js b/src/database.js
index 93f2b3c..02e2f19 100644
--- a/src/database.js
+++ b/src/database.js
@@ -296,7 +296,7 @@ function Database(user, password, dbname, host = 'localhost') {
             if (request.afterTime)
                 conditionArr.push(`${L_struct.LOG_TIME} > ${request.afterTime}`);
             conditionArr.push(`${H_struct.APPLICATION} = '${request.application}'`);
-            conditionArr.push(`IFNULL(${L_struct.PROXY_ID}, ${H_struct.RECEIVER_ID}) = '${request.receiverID}'`);
+            conditionArr.push(`IFNULL(${L_struct.PROXY_ID}, ${H_struct.RECEIVER_ID}) = '${cloud.proxyID(request.receiverID)}'`);
             if (request.comment)
                 conditionArr.push(`${B_struct.COMMENT} = '${request.comment}'`);
             if (request.type)