diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 24677681209..05e5873b44d 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -5507,7 +5507,7 @@ nsDocShell::AddToSessionHistory(nsIURI * aURI,
      * HistoryLayoutState. By default, SH will set this
      * flag to PR_TRUE and save HistoryLayoutState.
      */    
-    if (PL_strcasestr(val, "no-store")) {
+    if (val && (PL_strcasestr(val, "no-store") || PL_strcasestr(val, "no-cache"))) {
         entry->SetSaveLayoutStateFlag(PR_FALSE);
     }
     if (cacheToken) {