diff --git a/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java b/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java
index 3f989379..bd10f197 100644
--- a/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java
+++ b/src/main/java/com/commafeed/backend/favicon/AbstractFaviconFetcher.java
@@ -7,6 +7,8 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.lang.StringUtils;
 
+import com.commafeed.backend.model.Feed;
+
 @Slf4j
 public abstract class AbstractFaviconFetcher {
 
@@ -16,7 +18,7 @@ public abstract class AbstractFaviconFetcher {
 
 	protected static int TIMEOUT = 4000;
 
-	public abstract byte[] fetch(String url);
+	public abstract byte[] fetch(Feed feed);
 
 	protected boolean isValidIconResponse(byte[] content, String contentType) {
 		if (content == null) {
diff --git a/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java b/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
index 778d2f42..d6b90f8b 100644
--- a/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
+++ b/src/main/java/com/commafeed/backend/favicon/DefaultFaviconFetcher.java
@@ -14,6 +14,7 @@ import org.jsoup.select.Elements;
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
 import com.commafeed.backend.feed.FeedUtils;
+import com.commafeed.backend.model.Feed;
 
 /**
  * Inspired/Ported from https://github.com/potatolondon/getfavicon
@@ -27,7 +28,9 @@ public class DefaultFaviconFetcher extends AbstractFaviconFetcher {
 	private final HttpGetter getter;
 
 	@Override
-	public byte[] fetch(String url) {
+	public byte[] fetch(Feed feed) {
+		String url = feed.getLink() != null ? feed.getLink() : feed.getUrl();
+
 		if (url == null) {
 			log.debug("url is null");
 			return null;
diff --git a/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java b/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
index f126857d..7998d03d 100644
--- a/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
+++ b/src/main/java/com/commafeed/backend/favicon/YoutubeFaviconFetcher.java
@@ -12,6 +12,7 @@ import org.jsoup.select.Elements;
 
 import com.commafeed.backend.HttpGetter;
 import com.commafeed.backend.HttpGetter.HttpResult;
+import com.commafeed.backend.model.Feed;
 
 @Slf4j
 @RequiredArgsConstructor(onConstructor = @__({ @Inject }))
@@ -21,7 +22,9 @@ public class YoutubeFaviconFetcher extends AbstractFaviconFetcher {
 	private final HttpGetter getter;
 
 	@Override
-	public byte[] fetch(String url) {
+	public byte[] fetch(Feed feed) {
+		String url = feed.getUrl();
+
 		if (!url.toLowerCase().contains("://gdata.youtube.com/")) {
 			return null;
 		}
diff --git a/src/main/java/com/commafeed/backend/service/FeedService.java b/src/main/java/com/commafeed/backend/service/FeedService.java
index f162f5c3..59aaba30 100644
--- a/src/main/java/com/commafeed/backend/service/FeedService.java
+++ b/src/main/java/com/commafeed/backend/service/FeedService.java
@@ -50,11 +50,10 @@ public class FeedService {
 	}
 
 	public byte[] fetchFavicon(Feed feed) {
-		String url = feed.getLink() != null ? feed.getLink() : feed.getUrl();
 
 		byte[] icon = null;
 		for (AbstractFaviconFetcher faviconFetcher : faviconFetchers) {
-			icon = faviconFetcher.fetch(url);
+			icon = faviconFetcher.fetch(feed);
 			if (icon != null) {
 				break;
 			}