diff --git a/ntoskrnl/cache/section/sptab.c b/ntoskrnl/cache/section/sptab.c
index 5149ea3b76e..83f7c5f542a 100644
--- a/ntoskrnl/cache/section/sptab.c
+++ b/ntoskrnl/cache/section/sptab.c
@@ -223,8 +223,17 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
             if (PFN_FROM_SSE(Entry) != PFN_FROM_SSE(OldEntry))
             {
                 MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry));
+
+                /* This has to be done before setting the new section association
+                   to prevent a race condition with the paging out path */
+                PageTable->PageEntries[PageIndex] = Entry;
+
                 MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset);
             }
+            else
+            {
+                PageTable->PageEntries[PageIndex] = Entry;
+            }
         }
         else
         {
@@ -232,6 +241,7 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
              * We're switching to a valid entry from an invalid one.
              * Add the Rmap and take a ref on the segment.
              */
+            PageTable->PageEntries[PageIndex] = Entry;
             MmSetSectionAssociation(PFN_FROM_SSE(Entry), Segment, Offset);
 
             if (Offset->QuadPart >= (Segment->LastPage << PAGE_SHIFT))
@@ -242,6 +252,7 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
     {
         /* We're switching to an invalid entry from a valid one */
         MmDeleteSectionAssociation(PFN_FROM_SSE(OldEntry));
+        PageTable->PageEntries[PageIndex] = Entry;
 
         if (Offset->QuadPart == ((Segment->LastPage - 1ULL) << PAGE_SHIFT))
         {
@@ -256,8 +267,11 @@ _MmSetPageEntrySectionSegment(PMM_SECTION_SEGMENT Segment,
             }
         }
     }
+    else
+    {
+        PageTable->PageEntries[PageIndex] = Entry;
+    }
 
-    PageTable->PageEntries[PageIndex] = Entry;
     return STATUS_SUCCESS;
 }