diff --git a/src/components/MainNavBars/MainNavBars.tsx b/src/components/MainNavBars/MainNavBars.tsx
index e3b4a7ea4..03e314b93 100644
--- a/src/components/MainNavBars/MainNavBars.tsx
+++ b/src/components/MainNavBars/MainNavBars.tsx
@@ -26,8 +26,8 @@ const MainNavBars = memo(({ className, route, query, children }: Props) => {
     const navRef = React.useRef(null);
     const contentRef = React.useRef(null);
 
-    useContentGamepadNavigation(contentRef, route || '');
-    useVerticalNavGamepadNavigation(navRef, route || '');
+    useContentGamepadNavigation(contentRef, route ?? 'board');
+    useVerticalNavGamepadNavigation(navRef, route ?? 'board');
 
     return (
         <div className={classnames(className, styles['main-nav-bars-container'])}>
diff --git a/src/services/GamepadContext/GamepadProvider.tsx b/src/services/GamepadContext/GamepadProvider.tsx
index edf69bcd7..b663532f0 100644
--- a/src/services/GamepadContext/GamepadProvider.tsx
+++ b/src/services/GamepadContext/GamepadProvider.tsx
@@ -7,11 +7,13 @@ import GamepadContext from './GamepadContext';
 
 type GamepadEventHandlers = Map<string, Map<string, (data?: any) => void>>;
 
-const GamepadProvider: React.FC<{
+type GamepadProviderProps = {
     enabled: boolean;
     onGuide?: () => void;
     children: React.ReactNode;
-}> = ({ enabled, onGuide, children }) => {
+};
+
+const GamepadProvider = ({ enabled, onGuide, children }: GamepadProviderProps) => {
     const { t } = useTranslation();
     const toast = useToast();
     const connectedGamepads = useRef<number>(0);