diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx
index 004e4bc9..0f65ba0d 100644
--- a/src/components/navigator/NavigatorView.tsx
+++ b/src/components/navigator/NavigatorView.tsx
@@ -235,8 +235,6 @@ export const NavigatorView: FC<{}> = props =>
     {
         if(!isVisible || !LAST_SEARCH || !LAST_SEARCH.length) return;
 
-        console.log(LAST_SEARCH)
-
         CreateLinkEvent(`navigator/search/${ LAST_SEARCH }`);
     }, [ isVisible ]);
 
diff --git a/src/components/navigator/views/search/NavigatorSearchView.tsx b/src/components/navigator/views/search/NavigatorSearchView.tsx
index 9f975150..c09d3f0c 100644
--- a/src/components/navigator/views/search/NavigatorSearchView.tsx
+++ b/src/components/navigator/views/search/NavigatorSearchView.tsx
@@ -47,6 +47,8 @@ export const NavigatorSearchView: FC<NavigatorSearchViewProps> = props =>
 
     useEffect(() =>
     {
+        if(!searchResult || !searchResult.data) return;
+        
         const searchResultDataParts = searchResult.data.split(':');
 
         LAST_SEARCH = `${ topLevelContext.code }/${ searchResult.data }`;