diff --git a/Changelog.md b/Changelog.md
index e2a4496d6..6c124dc1d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -96,6 +96,7 @@ Contributions are very welcome, the hard work is done!
 * Fix timeago tooltips for reshares [#6648](https://github.com/diaspora/diaspora/pull/6648)
 * "Getting started" is now turned off after first visit on mobile [#6681](https://github.com/diaspora/diaspora/pull/6681)
 * Fixed a 500 when liking on mobile without JS enabled [#6683](https://github.com/diaspora/diaspora/pull/6683)
+* Fixed profile image upload in the mobile UI [#6684](https://github.com/diaspora/diaspora/pull/6684)
 
 ## Features
 * Support color themes [#6033](https://github.com/diaspora/diaspora/pull/6033)
diff --git a/app/views/photos/_new_profile_photo.haml b/app/views/photos/_new_profile_photo.haml
index 70b0d4c37..77808b588 100644
--- a/app/views/photos/_new_profile_photo.haml
+++ b/app/views/photos/_new_profile_photo.haml
@@ -38,7 +38,7 @@
 
           /* flash message prompt */
           var message = Diaspora.I18n.t("photo_uploader.looking_good");
-          app.flashMessages.success(message);
+          if(app.flashMessages) { app.flashMessages.success(message); }
 
           var id = responseJSON.data.photo.id;
           var url = responseJSON.data.photo.unprocessed_image.url;