diff --git a/UNRELEASED.md b/UNRELEASED.md
index e42dde2ddd0..fcc5ebd6b65 100644
--- a/UNRELEASED.md
+++ b/UNRELEASED.md
@@ -14,6 +14,7 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f
 - Removed erroneous scss file import that rendered Polaris unable to be used in typescript projects without scss support ([#609](https://github.com/Shopify/polaris-react/pull/609))
 - Fixed `Popover` inconsistent `border-radius` values ([#605](https://github.com/Shopify/polaris-react/pull/605))
 - `TextStyle` "strong" variant now uses a `span` tag instead of `b` ([#606](https://github.com/Shopify/polaris-react/pull/606))
+- Fixed non-blocking context errors when using `Toast` or `Loading` in an embedded app ([#613](https://github.com/Shopify/polaris-react/pull/613))
 
 ### Documentation
 
diff --git a/src/components/types.ts b/src/components/types.ts
index 7008aef6e3e..ce54d19229e 100644
--- a/src/components/types.ts
+++ b/src/components/types.ts
@@ -23,7 +23,7 @@ export interface FrameContext {
 }
 
 export const frameContextTypes = {
-  frame: PropTypes.object.isRequired,
+  frame: PropTypes.object,
 };
 
 export type TransitionStatus = 'entering' | 'entered' | 'exiting' | 'exited';