diff --git a/src/components/Context.js b/src/components/Context.js
index 4c8a3460..e3b46cbb 100644
--- a/src/components/Context.js
+++ b/src/components/Context.js
@@ -45,13 +45,13 @@ function reducer(state, action) {
 
 export function PlaygroundProvider(props) {
   let { initialValues: { markup, query } = {} } = props;
-  const result = parser.parse({ markup, query, cacheId: props.instanceId });
 
   if (!markup && !query) {
     markup = defaultValues.markup;
     query = defaultValues.query;
   }
 
+  const result = parser.parse({ markup, query, cacheId: props.instanceId });
   const [state, dispatch] = useReducer(reducer, { result, markup, query });
 
   useEffect(() => {