diff --git a/src/client/browserContext.ts b/src/client/browserContext.ts
index 6af746c49e..3eb7ad96b5 100644
--- a/src/client/browserContext.ts
+++ b/src/client/browserContext.ts
@@ -232,7 +232,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel,
       const state = await channel.storageState();
       if (options.path) {
         await mkdirIfNeeded(options.path);
-        await fsWriteFileAsync(options.path, JSON.stringify(state), 'utf8');
+        await fsWriteFileAsync(options.path, JSON.stringify(state, undefined, 2), 'utf8');
       }
       return state;
     });
diff --git a/src/server/browserContext.ts b/src/server/browserContext.ts
index e0d25b7e0c..3996bf5d5b 100644
--- a/src/server/browserContext.ts
+++ b/src/server/browserContext.ts
@@ -314,13 +314,14 @@ export abstract class BrowserContext extends SdkObject {
       });
       for (const origin of this._origins) {
         const originStorage: types.OriginStorage = { origin, localStorage: [] };
-        result.origins.push(originStorage);
         const frame = page.mainFrame();
         await frame.goto(internalMetadata, origin);
         const storage = await frame._evaluateExpression(`({
           localStorage: Object.keys(localStorage).map(name => ({ name, value: localStorage.getItem(name) })),
         })`, false, undefined, 'utility');
         originStorage.localStorage = storage.localStorage;
+        if (storage.localStorage.length)
+          result.origins.push(originStorage);
       }
       await page.close(internalMetadata);
     }
diff --git a/test/browsercontext-storage-state.spec.ts b/test/browsercontext-storage-state.spec.ts
index 735b4392df..e8f9378bb2 100644
--- a/test/browsercontext-storage-state.spec.ts
+++ b/test/browsercontext-storage-state.spec.ts
@@ -86,7 +86,7 @@ it('should round-trip through the file', async ({ browser, context, testInfo })
   const path = testInfo.outputPath('storage-state.json');
   const state = await context.storageState({ path });
   const written = await fs.promises.readFile(path, 'utf8');
-  expect(JSON.stringify(state)).toBe(written);
+  expect(JSON.stringify(state, undefined, 2)).toBe(written);
 
   const context2 = await browser.newContext({ storageState: path });
   const page2 = await context2.newPage();