diff --git a/protocol/messenger_backup_handler.go b/protocol/messenger_backup_handler.go
index 5f83877dc..d3eb1d680 100644
--- a/protocol/messenger_backup_handler.go
+++ b/protocol/messenger_backup_handler.go
@@ -181,7 +181,9 @@ func (m *Messenger) handleBackedUpProfile(message *protobuf.BackedUpProfile, bac
 	if err != nil {
 		return err
 	}
-	response.SetProfileShowcasePreferences(profileShowcasePreferences)
+	if profileShowcasePreferences != nil {
+		response.SetProfileShowcasePreferences(profileShowcasePreferences)
+	}
 
 	var ensUsernameDetails []*ensservice.UsernameDetail
 	for _, d := range message.EnsUsernameDetails {
diff --git a/protocol/messenger_profile_showcase.go b/protocol/messenger_profile_showcase.go
index 2b53c7c26..8a1d369c8 100644
--- a/protocol/messenger_profile_showcase.go
+++ b/protocol/messenger_profile_showcase.go
@@ -669,6 +669,9 @@ func (m *Messenger) DeleteProfileShowcaseCommunity(community *communities.Commun
 }
 
 func (m *Messenger) saveProfileShowcasePreferencesProto(p *protobuf.SyncProfileShowcasePreferences, shouldSync bool) (*identity.ProfileShowcasePreferences, error) {
+	if p == nil {
+		return nil, nil
+	}
 	preferences := FromProfileShowcasePreferencesProto(p)
 	return preferences, m.setProfileShowcasePreferences(preferences, shouldSync)
 }