diff --git a/src/helpers/messageHelper.js b/src/helpers/messageHelper.js
index ac07535..dd301fc 100644
--- a/src/helpers/messageHelper.js
+++ b/src/helpers/messageHelper.js
@@ -57,8 +57,7 @@ msgh.parseProxyTags = async function (authorId, content, attachmentUrl = null){
             const splitProxy = member.proxy.split("text");
             if(content.startsWith(splitProxy[0]) && content.endsWith(splitProxy[1])) {
                 proxyMessage.member = member;
-                if (attachmentUrl) proxyMessage.hasAttachment = true;
-
+                proxyMessage.hasAttachment = !!attachmentUrl;
                 let escapedPrefix = splitProxy[0].replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
                 let escapedSuffix = splitProxy[1].replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
                 escapedPrefix = new RegExp("^" + escapedPrefix);
diff --git a/tests/helpers/messageHelper.test.js b/tests/helpers/messageHelper.test.js
index aff235d..dff3d6c 100644
--- a/tests/helpers/messageHelper.test.js
+++ b/tests/helpers/messageHelper.test.js
@@ -68,13 +68,13 @@ describe('messageHelper', () => {
 
         test.each([
             ['1', 'hello', null, {}],
-            ['1', '--hello', null, {member: membersFor1[0], message: 'hello'}],
+            ['1', '--hello', null, {member: membersFor1[0], message: 'hello', hasAttachment: false}],
             ['1', 'hello', attachmentUrl, {}],
             ['1', '--hello', attachmentUrl, {member: membersFor1[0], message: 'hello', hasAttachment: true}],
             ['1', '--', attachmentUrl, {member: membersFor1[0], message: '', hasAttachment: true}],
-            ['1', '?hello}', null, {member: membersFor1[3], message: 'hello'}],
-            ['1', '{hello}', null, {member: membersFor1[4], message: 'hello'}],
-            ['1', '⭐hello', null, {member: membersFor1[5], message: 'hello'}],
+            ['1', '?hello}', null, {member: membersFor1[3], message: 'hello', hasAttachment: false}],
+            ['1', '{hello}', null, {member: membersFor1[4], message: 'hello', hasAttachment: false}],
+            ['1', '⭐hello', null, {member: membersFor1[5], message: 'hello', hasAttachment: false}],
             ['2', 'hello', null, undefined],
             ['2', '--hello', null, undefined],
             ['2', 'hello', attachmentUrl, undefined],