diff --git a/account_export_test.go b/account_export_test.go
index 2ace38ff..8eb83519 100644
--- a/account_export_test.go
+++ b/account_export_test.go
@@ -6,11 +6,12 @@ import (
 	"io"
 	"os"
 	"testing"
+	"time"
 
+	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/ipfs/go-cid"
 	ds "github.com/ipfs/go-datastore"
 	dsync "github.com/ipfs/go-datastore/sync"
-	mocknet "github.com/berty/go-libp2p-mock"
 	"github.com/stretchr/testify/require"
 
 	orbitdb "berty.tech/go-orbit-db"
@@ -217,6 +218,8 @@ func TestRestoreAccount(t *testing.T) {
 		_, err = nodeB.Service.ActivateGroup(ctx, &protocoltypes.ActivateGroup_Request{GroupPK: g.PublicKey})
 		require.NoError(t, err)
 
+		<-time.After(time.Millisecond * 500)
+
 		for _, gPK := range [][]byte{nodeBInstanceConfig.AccountGroupPK, g.PublicKey} {
 			sub, err := nodeB.Client.GroupMessageList(
 				ctx,
diff --git a/store_message.go b/store_message.go
index 01f53302..9742c915 100644
--- a/store_message.go
+++ b/store_message.go
@@ -276,7 +276,8 @@ func (m *MessageStore) ListEvents(ctx context.Context, since, until []byte, reve
 			func(entry ipliface.IPFSLogEntry) {
 				message, err := m.openMessage(ctx, entry)
 				if err != nil {
-					m.logger.Error("unable to open message", zap.Error(err))
+					m.logger.Error("unable to open message, adding to queue for later decrypt", zap.Error(err))
+
 				} else {
 					out <- message
 					m.logger.Info("message store - sent 1 event from log history")