diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx
index 9f5488b51..843298d68 100644
--- a/views/Settings/NodeConfiguration.tsx
+++ b/views/Settings/NodeConfiguration.tsx
@@ -959,9 +959,7 @@ export default class NodeConfiguration extends React.Component<
                         <View style={styles.container}>
                             <TouchableOpacity
                                 onPress={
-                                    (node === null ||
-                                        node?.photo === '' ||
-                                        node?.photo === null) &&
+                                    (node === null || !node.photo) &&
                                     photo === null
                                         ? () =>
                                               navigation.navigate(
@@ -970,7 +968,7 @@ export default class NodeConfiguration extends React.Component<
                                               )
                                         : () =>
                                               this.setState(
-                                                  { photo: null },
+                                                  { photo: null, saved: false },
                                                   () =>
                                                       node
                                                           ? (node.photo = '')
diff --git a/views/Settings/SetNodePicture.tsx b/views/Settings/SetNodePicture.tsx
index 85a0cc9f1..3ab6de303 100644
--- a/views/Settings/SetNodePicture.tsx
+++ b/views/Settings/SetNodePicture.tsx
@@ -244,7 +244,8 @@ export default class SetNodePicture extends React.Component<
                     title={localeString('views.SetNodePicture.setPicture')}
                     onPress={() => {
                         navigation.navigate('NodeConfiguration', {
-                            photo
+                            photo,
+                            saved: false
                         });
                     }}
                     containerStyle={{ paddingBottom: 10 }}