Better tippy loading. Fixes #577

1 files changed, 1 insertions, 6 deletions

diff --git a/ui/src/components/navbar.tsx b/ui/src/components/navbar.tsx
index 031c2ecb..ef3f8430 100644
--- a/ui/src/components/navbar.tsx
+++ b/ui/src/components/navbar.tsx
@@ -26,7 +26,6 @@ import {
   fetchLimit,
   isCommentType,
   toast,
-  setupTippy,
 } from '../utils';
 import { version } from '../version';
 import { i18n } from '../i18next';
@@ -85,10 +84,6 @@ export class Navbar extends Component<any, NavbarState> {
     WebSocketService.Instance.getSite();
   }
 
-  componentDidMount() {
-    setupTippy();
-  }
-
   render() {
     return this.navbar();
   }
@@ -283,7 +278,7 @@ export class Navbar extends Component<any, NavbarState> {
     } else if (res.op == UserOperation.GetSite) {
       let data = res.data as GetSiteResponse;
 
-      if (data.site) {
+      if (data.site && !this.state.siteName) {
         this.state.siteName = data.site.name;
         WebSocketService.Instance.site = data.site;
         this.setState(this.state);