diff --git a/lib/Client.js b/lib/Client.js
index ffc83427d..4cba599ec 100644
--- a/lib/Client.js
+++ b/lib/Client.js
@@ -1185,6 +1185,9 @@ class Client extends EventEmitter {
         if(typeof filter === "string") {
             filter = (msg) => msg.content.includes(filter);
         }
+        if(limit !== -1 && limit <= 0) {
+            Promise.resolve(0);
+        }
         return new Promise((resolve, reject) => {
             var toDelete = [];
             var deleted = 0;
@@ -1211,12 +1214,12 @@ class Client extends EventEmitter {
             };
             var del = (_before, _after) => {
                 this.getMessages(channelID, 100, _before, _after).then((messages) => {
-                    if(limit === 0) {
+                    if(limit !== -1 && limit <= 0) {
                         done = true;
                         return;
                     }
                     for(var message of messages) {
-                        if(limit === 0) {
+                        if(limit !== -1 && limit <= 0) {
                             break;
                         }
                         if(message.timestamp < Date.now() - 1209600000) { // 14d * 24h * 60m * 60s * 1000ms
@@ -1228,7 +1231,7 @@ class Client extends EventEmitter {
                         }
                         limit--;
                     }
-                    if(limit === 0 || messages.length < 100) {
+                    if((limit !== -1 && limit <= 0) || messages.length < 100) {
                         done = true;
                         return;
                     }