diff --git a/GreenshotFlickrPlugin/FlickrUtils.cs b/GreenshotFlickrPlugin/FlickrUtils.cs
index 00cb56ed4..c9f8019a0 100644
--- a/GreenshotFlickrPlugin/FlickrUtils.cs
+++ b/GreenshotFlickrPlugin/FlickrUtils.cs
@@ -42,7 +42,7 @@ namespace GreenshotFlickrPlugin {
 		private const string FLICKR_ACCESS_TOKEN_URL = FLICKR_OAUTH_BASE_URL + "access_token";
 		private const string FLICKR_AUTHORIZE_URL = FLICKR_OAUTH_BASE_URL + "authorize";
 		private const string FLICKR_REQUEST_TOKEN_URL = FLICKR_OAUTH_BASE_URL + "request_token";
-		private const string FLICKR_FARM_URL = "https://farm{0}.staticflickr.com/{1}/{2}_{3}.jpg";
+		private const string FLICKR_FARM_URL = "https://farm{0}.staticflickr.com/{1}/{2}_{3}_o.{4}";
 		// REST
 		private const string FLICKR_REST_URL = FLICKR_API_BASE_URL + "rest/";
 		private const string FLICKR_GET_INFO_URL = FLICKR_REST_URL + "?method=flickr.photos.getInfo";
@@ -132,7 +132,8 @@ namespace GreenshotFlickrPlugin {
 							string serverId = item.Attributes["server"].Value;
 							string photoId = item.Attributes["id"].Value;
 							string secret = item.Attributes["secret"].Value;
-							return string.Format(FLICKR_FARM_URL, farmId, serverId, photoId, secret);
+							string originalFormat = item.Attributes["originalformat"].Value;
+							return string.Format(FLICKR_FARM_URL, farmId, serverId, photoId, secret, originalFormat);
 						}
 					}
 				}