diff --git a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
index 09ab54ab3..ecd85fa18 100644
--- a/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
+++ b/packages/bruno-app/src/components/RequestPane/GraphQLRequestPane/index.js
@@ -46,8 +46,8 @@ const GraphQLRequestPane = ({ item, collection, onSchemaLoad, toggleDocs, handle
     ? get(item, 'draft.request.body.graphql.query', '')
     : get(item, 'request.body.graphql.query', '');
   const variables = item.draft
-    ? get(item, 'draft.request.body.graphql.variables')
-    : get(item, 'request.body.graphql.variables');
+    ? get(item, 'draft.request.body.graphql.variables', '')
+    : get(item, 'request.body.graphql.variables', '');
 
   const { displayedTheme } = useTheme();
   const [schema, setSchema] = useState(null);
diff --git a/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
index f75a5f2e2..a6d527af3 100644
--- a/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
+++ b/packages/bruno-filestore/src/formats/yml/items/parseGraphQLRequest.ts
@@ -29,8 +29,8 @@ const parseGraphQLRequest = (ocRequest: GraphQLRequest): BrunoItem => {
       formUrlEncoded: [],
       multipartForm: [],
       graphql: {
-        query: (graphql?.body as GraphQLBody)?.query || null,
-        variables: (graphql?.body as GraphQLBody)?.variables || null
+        query: (graphql?.body as GraphQLBody)?.query || '',
+        variables: (graphql?.body as GraphQLBody)?.variables || ''
       },
       file: []
     },
diff --git a/tests/utils/page/actions.ts b/tests/utils/page/actions.ts
index 59c48d5d0..1d27b0c86 100644
--- a/tests/utils/page/actions.ts
+++ b/tests/utils/page/actions.ts
@@ -382,6 +382,7 @@ const createEnvironment = async (
     await expect(page.locator('.request-tab').filter({ hasText: tabLabel })).toBeVisible();
 
     const locators = buildCommonLocators(page);
+    await page.waitForTimeout(200); // @TODO replace with dynamic waiting logic
     await locators.environment.selector().click();
     if (type === 'global') {
       await locators.environment.globalTab().click();