diff --git a/impl/src/main/java/com/sun/faces/context/FacesContextImpl.java b/impl/src/main/java/com/sun/faces/context/FacesContextImpl.java
index a75013b10d..64657f1b46 100644
--- a/impl/src/main/java/com/sun/faces/context/FacesContextImpl.java
+++ b/impl/src/main/java/com/sun/faces/context/FacesContextImpl.java
@@ -424,7 +424,7 @@ public void setViewRoot(UIViewRoot root) {
         if (viewRoot != null && !viewRoot.equals(root)) {
             Map<String, Object> viewMap = viewRoot.getViewMap(false);
             if (viewMap != null) {
-                viewRoot.getViewMap().clear();
+                viewMap.clear();
             }
             RequestStateManager.clearAttributesOnChangeOfView(this);
         }