diff --git a/src/features/Common/Input/styled.tsx b/src/features/Common/Input/styled.tsx
index 0bcdb2a6..39e89750 100644
--- a/src/features/Common/Input/styled.tsx
+++ b/src/features/Common/Input/styled.tsx
@@ -232,7 +232,7 @@ export const LabelBefore = styled(LabelAfter)`
   padding-top: 5px;
 `
 
-export const ScTooltip = styled.div`
+export const ScTooltip = styled.span`
   display: none;
   position: absolute;
   font-weight: 600;
diff --git a/src/features/Matches/hooks.tsx b/src/features/Matches/hooks.tsx
index 5150876f..4f0bd402 100644
--- a/src/features/Matches/hooks.tsx
+++ b/src/features/Matches/hooks.tsx
@@ -69,6 +69,10 @@ export const useMatches = ({ fetch }: Props) => {
   useEffect(() => {
     fetchMatches(0).then(setMatches)
     pageRef.current = 1
+
+    return () => {
+      setMatches(initialState)
+    }
   }, [fetchMatches, userPreferences])
 
   const preparedMatches = useMemo(() => ({
diff --git a/src/features/Search/hooks/index.tsx b/src/features/Search/hooks/index.tsx
index 35c05955..51f9e75b 100644
--- a/src/features/Search/hooks/index.tsx
+++ b/src/features/Search/hooks/index.tsx
@@ -58,6 +58,9 @@ export const useSearch = () => {
     } else {
       open()
     }
+    return () => {
+      setSelectedTab(ProfileTypes.TOURNAMENTS)
+    }
   }, [searchItems, close, open])
 
   const closePopup = () => {