diff --git a/lib/Util/Cache.js b/lib/Util/Cache.js
index 24ba54a9f..1ed6a545f 100644
--- a/lib/Util/Cache.js
+++ b/lib/Util/Cache.js
@@ -132,6 +132,8 @@ var Cache = (function (_Array) {
 	};
 
 	Cache.prototype.remove = function remove(data) {
+		if (!this[discrimCacheS][data[this[discrimS]]]) return false;
+
 		delete this[discrimCacheS][data[this[discrimS]]];
 		for (var i in this) {
 			if (this[i] && this[i][this[discrimS]] === data[this[discrimS]]) {
diff --git a/src/Util/Cache.js b/src/Util/Cache.js
index d1d78dd5a..31b98011c 100644
--- a/src/Util/Cache.js
+++ b/src/Util/Cache.js
@@ -96,6 +96,8 @@ export default class Cache extends Array {
 	}
 
 	remove(data) {
+		if(!this[discrimCacheS][data[this[discrimS]]]) return false;
+
 		delete this[discrimCacheS][data[this[discrimS]]];
 		for (var i in this) {
 			if (this[i] && this[i][this[discrimS]] === data[this[discrimS]]) {