diff --git a/modules/quotes.js b/modules/quotes.js
index 0b2bd9c..2651097 100644
--- a/modules/quotes.js
+++ b/modules/quotes.js
@@ -52,6 +52,9 @@ var quotes = function(dbot) {
                     if(quotes.hasOwnProperty(q[1])) {
                         if(!dbot.db.locks.include(q[1]) || data.user == dbot.admin) {
                             var quote = quotes[key].pop();
+                            if(quotes[key] === undefined) {
+                                delete quotes[key];
+                            }
                             rmAllowed = false;
                             dbot.say(data.channel, '\'' + quote + '\' removed from ' + q[1]);
                         } else {