diff --git a/src/Archive/Redirect.coffee b/src/Archive/Redirect.coffee
index 683398a39..86a097f92 100644
--- a/src/Archive/Redirect.coffee
+++ b/src/Archive/Redirect.coffee
@@ -127,7 +127,11 @@ Redirect =
     url
 
   file: (archive, {boardID, filename}) ->
-    filename = encodeURIComponent $.unescape decodeURIComponent filename if boardID is 'f'
+    return '' unless filename
+    if boardID is 'f'
+      filename = encodeURIComponent $.unescape decodeURIComponent filename
+    else
+      return '' if /[sm]\.jpg$/.test(filename)
     "#{Redirect.protocol archive}#{archive.domain}/#{boardID}/full_image/#{filename}"
 
   board: (archive, {boardID}) ->
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 1b11dc095..dfca86789 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -157,7 +157,6 @@ Main =
         return
 
     if ImageHost.test hostname
-      return unless pathname[2] and not /[sm]\.jpg$/.test(pathname[2])
       $.asap (-> d.readyState isnt 'loading'), ->
         if Conf['404 Redirect'] and g.SITE.is404?()
           Redirect.navigate 'file', {