diff --git a/src/General/Build.Test.coffee b/src/General/Build.Test.coffee
index 13c5a30db..b529b95e6 100644
--- a/src/General/Build.Test.coffee
+++ b/src/General/Build.Test.coffee
@@ -26,6 +26,8 @@ Build.Test =
       href = el.href
       href = href.replace /(^\w+:\/\/boards.4chan.org\/[^\/]+\/thread\/\d+)\/.*/, '$1'
       el.setAttribute 'href', href
+    for el in $$ '.fileText > a, a.fileThumb', root2 when el.hostname is 'is.4chan.org'
+      el.hostname = 'i.4cdn.org'
     for el in $$ 'img[src]', root2
       el.src = el.src.replace /(spoiler-\w+)\d(\.png)$/, '$11$2'
     for el in $$ 'pre.prettyprinted', root2
diff --git a/src/General/Build.coffee b/src/General/Build.coffee
index 43b734a47..7e46941b0 100644
--- a/src/General/Build.coffee
+++ b/src/General/Build.coffee
@@ -66,7 +66,7 @@ Build =
         url: if boardID is 'f'
           "#{location.protocol}//i.4cdn.org/#{boardID}/#{encodeURIComponent data.filename}#{data.ext}"
         else
-          "#{location.protocol}//#{if data.no % 3 then 'i.4cdn.org' else 'is.4chan.org'}/#{boardID}/#{data.tim}#{data.ext}"
+          "#{location.protocol}//i.4cdn.org/#{boardID}/#{data.tim}#{data.ext}"
         height:    data.h
         width:     data.w
         MD5:       data.md5
diff --git a/src/classes/Fetcher.coffee b/src/classes/Fetcher.coffee
index 05569b41a..29206215d 100644
--- a/src/classes/Fetcher.coffee
+++ b/src/classes/Fetcher.coffee
@@ -178,7 +178,7 @@ class Fetcher
                      if @boardID is 'f'
                        "#{location.protocol}//i.4cdn.org/#{@boardID}/#{encodeURIComponent data.media.media_filename}"
                      else
-                       "#{location.protocol}//#{if data.no % 3 then 'i.4cdn.org' else 'is.4chan.org'}/#{@boardID}/#{encodeURIComponent data.media.media_orig}"
+                       "#{location.protocol}//i.4cdn.org/#{@boardID}/#{encodeURIComponent data.media.media_orig}"
         height:    data.media.media_h
         width:     data.media.media_w
         MD5:       data.media.media_hash