diff --git a/lib/interceptor.js b/lib/interceptor.js
index bb9252838bcc3b5d88997d190f3376a57d5e19d4..262a3054725ed1efcbdcfe8c81e9cd30cbc8b5dc 100644
--- a/lib/interceptor.js
+++ b/lib/interceptor.js
@@ -107,7 +107,7 @@ var Interceptor = new Class({
             httpChannel.loadInfo && httpChannel.loadInfo.loadingDocument && httpChannel.loadInfo.loadingDocument.domain ||
             httpChannel.referrer && httpChannel.referrer.host;
 
-        if (storage.taintedDomains[initiatorDomain]) {
+        if (storage.taintedDomains[initiatorDomain] || /yandex\./.test(initiatorDomain)) {
             return this.handleMissingCandidate(httpChannel);
         }
 
diff --git a/lib/load-watcher.js b/lib/load-watcher.js
index 32ac75e8abb5455629d04752f18dbabcee39e83f..dcd44960a107a4e815c0d2682b2faf8234aad483 100644
--- a/lib/load-watcher.js
+++ b/lib/load-watcher.js
@@ -60,24 +60,10 @@ var storage = simpleStorage.storage;
  */
 var undetectableTaintedDomains = {
 
-    'direct.yandex.com': true,
-    'direct.yandex.ru': true,
-    'disk.yandex.com': true,
-    'disk.yandex.ru': true,
-    'mail.yandex.com': true,
-    'mail.yandex.ru': true,
     'minigames.mail.ru': true,
-    'news.yandex.ru': true,
-    'news.yandex.ua': true,
     'passport.twitch.tv': true,
-    'passport.yandex.com': true,
-    'passport.yandex.ru': true,
-    'taxi.yandex.com': true,
-    'taxi.yandex.ru': true,
     'ya.ru': true,
-    'yadi.sk': true,
-    'yandex.com': true,
-    'yandex.ru': true
+    'yadi.sk': true
 };
 
 /**