diff --git a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
index 8b2def6c..b8ff3768 100644
--- a/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
+++ b/src/containers/ProfileSettingsPage/ProfileSettingsPage.js
@@ -76,7 +76,8 @@ export class ProfileSettingsPageComponent extends Component {
 
     const user = ensureCurrentUser(currentUser);
     const { firstName, lastName } = user.attributes.profile;
-    const profileImage = image || { imageId: user.profileImage.id };
+    const profileImageId = user.profileImage ? user.profileImage.id : null;
+    const profileImage = image || { imageId: profileImageId };
 
     const profileSettingsForm = user.id
       ? <ProfileSettingsForm