diff --git a/src/renderer/redux/selectors/publish.js b/src/renderer/redux/selectors/publish.js
index 6556a8932..12bcb06e7 100644
--- a/src/renderer/redux/selectors/publish.js
+++ b/src/renderer/redux/selectors/publish.js
@@ -48,6 +48,10 @@ export const selectPendingPublish = uri =>
 export const selectIsStillEditing = createSelector(selectPublishFormValues, publishState => {
   const { editingURI, uri } = publishState;
 
+  if (!editingURI || !uri) {
+    return false;
+  }
+
   const {
     isChannel: currentIsChannel,
     claimName: currentClaimName,