diff --git a/matrixConsole/ViewController/SettingsViewController.m b/matrixConsole/ViewController/SettingsViewController.m
index 09def6c9a..89be6b4cd 100644
--- a/matrixConsole/ViewController/SettingsViewController.m
+++ b/matrixConsole/ViewController/SettingsViewController.m
@@ -307,6 +307,9 @@ NSString* const kCommandsDescriptionText = @"The following commands are availabl
     } else {
         [mxHandler.mxSession.myUser setAvatarUrl:uploadedPictureURL
                                      success:^{
+                                         // uploadedPictureURL becomes the uploaded picture
+                                         currentPictureURL = uploadedPictureURL;
+                                         // manage the nil case.
                                          [self updateUserPicture:uploadedPictureURL];
                                          uploadedPictureURL = nil;
                                          [_activityIndicator stopAnimating];