diff --git a/internal/store/user_address.go b/internal/store/user_address.go
index 3f7f5679..9e3ed47c 100644
--- a/internal/store/user_address.go
+++ b/internal/store/user_address.go
@@ -79,6 +79,9 @@ func (store *Store) RebuildMailboxes() (err error) {
 // It doesn't do anything to addresses that are rightfully there.
 // It should only be called from the event loop.
 func (store *Store) createOrDeleteAddressesEvent() (err error) {
+	store.lock.Lock()
+	defer store.lock.Unlock()
+
 	labels, err := store.initCounts()
 	if err != nil {
 		return errors.Wrap(err, "failed to initialise label counts")
diff --git a/unreleased.md b/unreleased.md
index 665aa2ed..72ff9941 100644
--- a/unreleased.md
+++ b/unreleased.md
@@ -26,6 +26,7 @@ Changelog [format](http://keepachangelog.com/en/1.0.0/)
 * GODT-894 Fix panic when sending while account is logging in.
 * GODT-831 Fix reporting bug from accounts with empty account name.
 * GODT-991 Fix panic when stopping import progress during loading mailboxes info.
+* GODT-895 Fix panic when modifying addresses during changing address mode.
 
 ### Changed
 * GODT-97 Don't log errors caused by SELECT "".