diff --git a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
index 7e5544413..add0de131 100644
--- a/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
+++ b/retroshare-gui/src/gui/Identity/IdEditDialog.cpp
@@ -700,8 +700,8 @@ void IdEditDialog::removeAvatar()
 
 void IdEditDialog::updateInterface()
 {
-	const QPixmap *pixmap = ui->avatarLabel->pixmap();
-	if (pixmap && !pixmap->isNull()) {
+	QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
+	if (!pixmap.isNull()) {
 		ui->removeButton->setEnabled(true);
     } else if (mEditGroup.mImage.mSize > 0) {
 		ui->removeButton->setEnabled(true);
diff --git a/retroshare-gui/src/gui/common/AvatarDialog.cpp b/retroshare-gui/src/gui/common/AvatarDialog.cpp
index 2cb595847..a5e8d15d4 100644
--- a/retroshare-gui/src/gui/common/AvatarDialog.cpp
+++ b/retroshare-gui/src/gui/common/AvatarDialog.cpp
@@ -107,8 +107,8 @@ void AvatarDialog::removeAvatar()
 
 void AvatarDialog::updateInterface()
 {
-	const QPixmap *pixmap = ui->avatarLabel->pixmap();
-	if (pixmap && !pixmap->isNull()) {
+	QPixmap pixmap = ui->avatarLabel->pixmap(Qt::ReturnByValue);
+	if (!pixmap.isNull()) {
 		ui->removeButton->setEnabled(true);
 	} else {
 		ui->removeButton->setEnabled(false);
@@ -123,13 +123,7 @@ void AvatarDialog::setAvatar(const QPixmap &avatar)
 
 void AvatarDialog::getAvatar(QPixmap &avatar)
 {
-	const QPixmap *pixmap = ui->avatarLabel->pixmap();
-	if (!pixmap) {
-		avatar = QPixmap();
-		return;
-	}
-
-	avatar = *pixmap;
+	avatar = ui->avatarLabel->pixmap(Qt::ReturnByValue);
 }
 
 void AvatarDialog::getAvatar(QByteArray &avatar)