diff --git a/includes/bootstrap.inc b/includes/bootstrap.inc
index 7f1bfbad18..f954ddd47a 100644
--- a/includes/bootstrap.inc
+++ b/includes/bootstrap.inc
@@ -1587,9 +1587,15 @@ function drupal_serve_page_from_cache(stdClass $cache) {
   $if_modified_since = isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) : FALSE;
   $if_none_match = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : FALSE;
 
-  if ($if_modified_since && $if_none_match
-      && $if_none_match == $etag // etag must match
-      && $if_modified_since == $cache->created) {  // if-modified-since must match
+  // Check for etag and etag must match.
+  $notModified = $if_none_match && $if_none_match == $etag;
+
+  if ($if_modified_since) {
+    $notModified = $if_modified_since >= $cache->created && (!$if_none_match || $notModified);
+  }
+
+  // Set 304 Not Modified header if content not modified.
+  if($notModified){
     header($_SERVER['SERVER_PROTOCOL'] . ' 304 Not Modified');
     drupal_send_headers($default_headers);
     return;
