diff --git a/NzbDrone.Api/Extensions/ReqResExtensions.cs b/NzbDrone.Api/Extensions/ReqResExtensions.cs
index 322217cc4..fd9980347 100644
--- a/NzbDrone.Api/Extensions/ReqResExtensions.cs
+++ b/NzbDrone.Api/Extensions/ReqResExtensions.cs
@@ -3,14 +3,18 @@
 using System.IO;
 using Nancy;
 using Nancy.Responses;
+using NzbDrone.Common.EnvironmentInfo;
 using NzbDrone.Common.Serializer;
 
 namespace NzbDrone.Api.Extensions
 {
-    public static class JsonExtensions
+    public static class ReqResExtensions
     {
         private static readonly NancyJsonSerializer NancySerializer = new NancyJsonSerializer();
 
+
+        public static readonly string LastModified = BuildInfo.BuildDateTime.ToString("r");
+
         public static T FromJson<T>(this Stream body) where T : class, new()
         {
             return FromJson<T>(body, typeof(T));
@@ -51,7 +55,7 @@ public static IDictionary<string, string> EnableCache(this IDictionary<string, s
         {
             headers["Cache-Control"] = "max-age=31536000 , public";
             headers["Expires"] = "Sat, 29 Jun 2020 00:00:00 GMT";
-            headers["Last-Modified"] = "Sat, 29 Jun 2000 00:00:00 GMT";
+            headers["Last-Modified"] = LastModified;
             headers["Age"] = "193266";
 
             return headers;
diff --git a/NzbDrone.Api/Frontend/StaticResourceProvider.cs b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
index 698bd77d7..1d2c6fb57 100644
--- a/NzbDrone.Api/Frontend/StaticResourceProvider.cs
+++ b/NzbDrone.Api/Frontend/StaticResourceProvider.cs
@@ -48,6 +48,13 @@ public Response ProcessStaticResourceRequest(NancyContext context, string workin
                 return null;
             }
 
+            if (context.Request.Headers.IfModifiedSince.HasValue)
+            {
+                var response = new Response { ContentType = MimeTypes.GetMimeType(path), StatusCode = HttpStatusCode.NotModified };
+                _addCacheHeaders.ToResponse(context.Request, response);
+                return response;
+            }
+
             var mapper = _requestMappers.SingleOrDefault(m => m.CanHandle(path));
 
             if (mapper != null)