diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs
index dd813b8..b54573d 100644
--- a/hammond-downloader/src/downloader.rs
+++ b/hammond-downloader/src/downloader.rs
@@ -2,6 +2,7 @@ use glob::glob;
 use hyper::header::*;
 use mime_guess;
 use reqwest;
+use reqwest::RedirectPolicy;
 use tempdir::TempDir;
 
 use std::fs;
@@ -37,7 +38,24 @@ fn download_into(
     progress: Option<Arc<Mutex<DownloadProgress>>>,
 ) -> Result<String> {
     info!("GET request to: {}", url);
-    let client = reqwest::Client::builder().referer(false).build()?;
+    // Haven't included the loop check as
+    // Steal the Stars would tigger it as
+    // it has a loop back before giving correct url
+    let policy = RedirectPolicy::custom(|attempt| {
+        info!("Redirect Attempt URL: {:?}", attempt.url());
+        if attempt.previous().len() > 5 {
+            attempt.too_many_redirects()
+        } else if Some(attempt.url()) == attempt.previous().last() {
+            attempt.loop_detected()
+        } else {
+            attempt.follow()
+        }
+    });
+
+    let client = reqwest::Client::builder()
+        .redirect(policy)
+        .referer(false)
+        .build()?;
     let mut resp = client.get(url).send()?;
     info!("Status Resp: {}", resp.status());