diff --git a/src/renderer/components/dock/edit-resource/view.tsx b/src/renderer/components/dock/edit-resource/view.tsx
index 9d92848f49..7a375fe549 100644
--- a/src/renderer/components/dock/edit-resource/view.tsx
+++ b/src/renderer/components/dock/edit-resource/view.tsx
@@ -45,8 +45,8 @@ class NonInjectedEditResource extends React.Component<EditResourceProps & Depend
         const tabData = this.props.editResourceStore.getData(this.props.tab.id);
         const obj = this.resource;
 
-        if (!obj) {
-          if (store?.isLoaded) {
+        if (!obj && store) {
+          if (store.isLoaded) {
             // auto-close tab when resource removed from store
             this.props.closeTab(this.props.tab.id);
           } else if (!store.isLoading) {