diff --git a/src/index.ts b/src/index.ts
index 5e5636b..44446b2 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -106,7 +106,7 @@ client.once('ready', async () => {
       return;
     }
 
-    if (e.cleanContent.includes('eta')) {
+    if (e.cleanContent.match(/(\b| )(eta|ETA)( |\?|!|\b)/)) {
       await e.reply(
         `${random([
           'Sometime',