diff --git a/app/renderer/components/publisherToggle.js b/app/renderer/components/publisherToggle.js
index e439cdb836d..87826742594 100644
--- a/app/renderer/components/publisherToggle.js
+++ b/app/renderer/components/publisherToggle.js
@@ -93,6 +93,9 @@ class PublisherToggle extends ImmutableComponent {
   }
 
   render () {
+    if (!this.props.locationInfo) {
+      return null
+    }
     return this.shouldShowAddPublisherButton
       ? <span
         data-test-id='publisherButton'
diff --git a/js/components/navigationBar.js b/js/components/navigationBar.js
index bb2d4582a19..fa5a8f298c2 100644
--- a/js/components/navigationBar.js
+++ b/js/components/navigationBar.js
@@ -119,12 +119,12 @@ class NavigationBar extends ImmutableComponent {
   }
 
   get publisherId () {
-    return (this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'publisher'])) || ''
+    return this.props.locationInfo && this.props.locationInfo.getIn([this.locationId, 'publisher'])
   }
 
   get visiblePublisher () {
     // No publisher is visible if ledger is disabled
-    if (!getSetting(settings.PAYMENTS_ENABLED)) {
+    if (!getSetting(settings.PAYMENTS_ENABLED) || !this.publisherId) {
       return false
     }
     const hostPattern = UrlUtil.getHostPattern(this.publisherId)