From 116fda7461ae6e454a50d090ff2d8ff5a696e535 Mon Sep 17 00:00:00 2001
From: Andrea Maria Piana <andrea.maria.piana@gmail.com>
Date: Thu, 21 Mar 2024 17:35:24 +0000
Subject: [PATCH] fix_: Remove rpc client from push notification servers and
 avoid panic

---
 cmd/statusd/main.go          | 1 -
 protocol/messenger_backup.go | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/statusd/main.go b/cmd/statusd/main.go
index c3cae3b44..9fa310550 100644
--- a/cmd/statusd/main.go
+++ b/cmd/statusd/main.go
@@ -231,7 +231,6 @@ func main() {
 			protocol.WithWalletDatabase(walletDB),
 			protocol.WithTorrentConfig(&config.TorrentConfig),
 			protocol.WithWalletConfig(&config.WalletConfig),
-			protocol.WithRPCClient(backend.StatusNode().RPCClient()),
 			protocol.WithAccountManager(backend.AccountManager()),
 		}
 
diff --git a/protocol/messenger_backup.go b/protocol/messenger_backup.go
index 5c7b9e530..defb77cd1 100644
--- a/protocol/messenger_backup.go
+++ b/protocol/messenger_backup.go
@@ -429,6 +429,10 @@ func (m *Messenger) backupProfile(ctx context.Context, clock uint64) ([]*protobu
 		return nil, err
 	}
 
+	if m.account == nil {
+		return nil, nil
+	}
+
 	keyUID := m.account.KeyUID
 	images, err := m.multiAccounts.GetIdentityImages(keyUID)
 	if err != nil {