diff --git a/mozilla/layout/base/nsFrameManager.cpp b/mozilla/layout/base/nsFrameManager.cpp
index 8cb5f466ff7..479120f5bd2 100644
--- a/mozilla/layout/base/nsFrameManager.cpp
+++ b/mozilla/layout/base/nsFrameManager.cpp
@@ -650,8 +650,8 @@ FrameManager::CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState)
     if (NS_SUCCEEDED(rv)) {
       PRUint32 ID;
       rv = content->GetContentID(&ID);
-      if (NS_SUCCEEDED(rv)) {
-        PRInt32 type = NS_HISTORY_STATE_TYPE_NONE;        
+      if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content)
+        StateType type = eNoType;
         rv = statefulFrame->GetStateType(&type);
         if (NS_SUCCEEDED(rv)) {
           nsISupports* frameState;
@@ -702,8 +702,8 @@ FrameManager::RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState)
     if (NS_SUCCEEDED(rv)) {
       PRUint32 ID;
       rv = content->GetContentID(&ID);
-      if (NS_SUCCEEDED(rv)) {
-        PRInt32 type = NS_HISTORY_STATE_TYPE_NONE;        
+      if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content)
+        StateType type = eNoType;
         rv = statefulFrame->GetStateType(&type);
         if (NS_SUCCEEDED(rv)) {
           nsISupports* frameState = nsnull;
diff --git a/mozilla/layout/html/base/src/nsFrameManager.cpp b/mozilla/layout/html/base/src/nsFrameManager.cpp
index 8cb5f466ff7..479120f5bd2 100644
--- a/mozilla/layout/html/base/src/nsFrameManager.cpp
+++ b/mozilla/layout/html/base/src/nsFrameManager.cpp
@@ -650,8 +650,8 @@ FrameManager::CaptureFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState)
     if (NS_SUCCEEDED(rv)) {
       PRUint32 ID;
       rv = content->GetContentID(&ID);
-      if (NS_SUCCEEDED(rv)) {
-        PRInt32 type = NS_HISTORY_STATE_TYPE_NONE;        
+      if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content)
+        StateType type = eNoType;
         rv = statefulFrame->GetStateType(&type);
         if (NS_SUCCEEDED(rv)) {
           nsISupports* frameState;
@@ -702,8 +702,8 @@ FrameManager::RestoreFrameState(nsIFrame* aFrame, nsILayoutHistoryState* aState)
     if (NS_SUCCEEDED(rv)) {
       PRUint32 ID;
       rv = content->GetContentID(&ID);
-      if (NS_SUCCEEDED(rv)) {
-        PRInt32 type = NS_HISTORY_STATE_TYPE_NONE;        
+      if (NS_SUCCEEDED(rv) && ID) { // Must have ID (don't do anonymous content)
+        StateType type = eNoType;
         rv = statefulFrame->GetStateType(&type);
         if (NS_SUCCEEDED(rv)) {
           nsISupports* frameState = nsnull;