diff --git a/app/src/actions/Tree.ts b/app/src/actions/Tree.ts
index c6cd19a..d2a1ad2 100644
--- a/app/src/actions/Tree.ts
+++ b/app/src/actions/Tree.ts
@@ -29,9 +29,9 @@ const debouncedSelectTopic = debounce(
 
     // Update publish topic
     let setTopicDispatch: any | undefined
-    if (!getState().publish.topic) {
+    if (!getState().publish.manualTopic) {
       setTopicDispatch = setTopic(topic.path())
-    } else if (previouslySelectedTopic && previouslySelectedTopic.path() === getState().publish.topic) {
+    } else if (previouslySelectedTopic && previouslySelectedTopic.path() === getState().publish.manualTopic) {
       setTopicDispatch = setTopic(topic.path())
     }
 
diff --git a/app/src/components/Sidebar/Publish/Publish.tsx b/app/src/components/Sidebar/Publish/Publish.tsx
index f1907e5..342c0eb 100644
--- a/app/src/components/Sidebar/Publish/Publish.tsx
+++ b/app/src/components/Sidebar/Publish/Publish.tsx
@@ -190,7 +190,7 @@ const mapDispatchToProps = (dispatch: any) => {
 
 const mapStateToProps = (state: AppState) => {
   return {
-    topic: state.publish.topic,
+    topic: state.publish.manualTopic,
     payload: state.publish.payload,
     editorMode: state.publish.editorMode,
     retain: state.publish.retain,