diff --git a/src/renderers/shared/fiber/ReactFiberCompleteWork.js b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
index 84af8a456d84d..2cd4388124809 100644
--- a/src/renderers/shared/fiber/ReactFiberCompleteWork.js
+++ b/src/renderers/shared/fiber/ReactFiberCompleteWork.js
@@ -202,7 +202,6 @@ module.exports = function<T, P, I, TI, C, CX>(
         return null;
       case HostRoot: {
         workInProgress.memoizedProps = workInProgress.pendingProps;
-        popContextProvider();
         const fiberRoot = (workInProgress.stateNode : FiberRoot);
         if (fiberRoot.pendingContext) {
           fiberRoot.context = fiberRoot.pendingContext;
diff --git a/src/renderers/shared/fiber/ReactFiberContext.js b/src/renderers/shared/fiber/ReactFiberContext.js
index 2479939e9b39c..4fdb8e2ec31dc 100644
--- a/src/renderers/shared/fiber/ReactFiberContext.js
+++ b/src/renderers/shared/fiber/ReactFiberContext.js
@@ -77,6 +77,7 @@ function isContextProvider(fiber : Fiber) : boolean {
 exports.isContextProvider = isContextProvider;
 
 function popContextProvider() : void {
+  invariant(index > -1, 'Unexpected context pop');
   contextStack[index] = emptyObject;
   didPerformWorkStack[index] = false;
   index--;