diff --git a/tabby-core/src/services/config.service.ts b/tabby-core/src/services/config.service.ts
index 730d6f0d..a1267dfb 100644
--- a/tabby-core/src/services/config.service.ts
+++ b/tabby-core/src/services/config.service.ts
@@ -194,6 +194,10 @@ export class ConfigService {
     }
 
     async save (): Promise<void> {
+        await this.ready$
+        if (!this._store) {
+            throw new Error('Cannot save an empty store')
+        }
         // Scrub undefined values
         let cleanStore = JSON.parse(JSON.stringify(this._store))
         cleanStore = await this.maybeEncryptConfig(cleanStore)