diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index 9e12f9cb4ad5..1d039fcfc4af 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -3344,6 +3344,9 @@ nsDocShell::AddChild(nsIDocShellTreeItem* aChild) {
     childDocShell->SetUseGlobalHistory(true);
   }
 
+  Cast(childDocShell)->SetRemoteTabs(mUseRemoteTabs);
+  Cast(childDocShell)->SetRemoteSubframes(mUseRemoteSubframes);
+
   if (aChild->ItemType() != mItemType) {
     return NS_OK;
   }
diff --git a/dom/ipc/WindowGlobalParent.cpp b/dom/ipc/WindowGlobalParent.cpp
index 1ec449f0e06c..d3aa24d7e771 100644
--- a/dom/ipc/WindowGlobalParent.cpp
+++ b/dom/ipc/WindowGlobalParent.cpp
@@ -333,6 +333,7 @@ already_AddRefed<Promise> WindowGlobalParent::ChangeFrameRemoteness(
         // in-process frame. For remote frames, the BrowserBridgeParent::Init
         // method should've already set up the OwnerProcessId.
         uint64_t childId = browserParent->Manager()->ChildID();
+        MOZ_ASSERT_IF(bridge, browsingContext == browserParent->GetBrowsingContext());
         MOZ_ASSERT_IF(bridge, browsingContext->IsOwnedByProcess(childId));
         browsingContext->SetOwnerProcessId(childId);