diff --git a/.eslintrc b/.eslintrc
index 219a5544..0a63f041 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -89,6 +89,7 @@
     "no-unused-vars": "off",
     "no-shadow": "off",
     "react/jsx-one-expression-per-line": "off",
+    "react/react-in-jsx-scope": "off",
     "react/jsx-fragments": "off",
     "react/require-default-props": "off",
     "semi": "off"
diff --git a/package.json b/package.json
index 3f39b8a8..79bab867 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "start": "DISABLE_NEW_JSX_TRANSFORM=true react-scripts start",
-    "build": "DISABLE_NEW_JSX_TRANSFORM=true GENERATE_SOURCEMAP=false react-scripts build && gzipper --verbose ./build",
+    "start": "react-scripts start",
+    "build": "GENERATE_SOURCEMAP=false react-scripts build && gzipper --verbose ./build",
     "test": "react-scripts test --testMatch '**/__tests__/*' --passWithNoTests --watchAll=false",
     "test:watch": "react-scripts test --testMatch '**/__tests__/*'",
     "eject": "react-scripts eject",
@@ -17,9 +17,9 @@
     "history": "^4.10.1",
     "hls.js": "^0.14.15",
     "lodash": "^4.17.15",
-    "react": "^16.13.1",
+    "react": "^17.0.1",
     "react-datepicker": "^3.1.3",
-    "react-dom": "^16.13.1",
+    "react-dom": "^17.0.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-scripts": "^4.0.1",
@@ -44,12 +44,12 @@
     "@types/jest": "^26.0.15",
     "@types/lodash": "^4.14.154",
     "@types/node": "^12.0.0",
-    "@types/react": "^16.9.0",
+    "@types/react": "^17.0.0",
     "@types/react-datepicker": "^3.0.2",
-    "@types/react-dom": "^16.9.0",
+    "@types/react-dom": "^17.0.0",
     "@types/react-responsive": "^8.0.2",
-    "@types/react-router": "^5.1.7",
-    "@types/react-router-dom": "^5.1.5",
+    "@types/react-router": "^5.1.8",
+    "@types/react-router-dom": "^5.1.6",
     "@types/styled-components": "^5.1.0",
     "commitizen": "^4.1.2",
     "eslint": "^7.14.0",
@@ -67,7 +67,7 @@
     "lint-staged": "^10.2.7",
     "storybook-addon-styled-component-theme": "^1.3.0",
     "ts-loader": "^7.0.5",
-    "typescript": "^4.0.5"
+    "typescript": "^4.1.2"
   },
   "config": {
     "commitizen": {
diff --git a/src/features/App/AuthenticatedApp.tsx b/src/features/App/AuthenticatedApp.tsx
index d7bfc320..e9edf544 100644
--- a/src/features/App/AuthenticatedApp.tsx
+++ b/src/features/App/AuthenticatedApp.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {
   Route,
   Redirect,
diff --git a/src/features/App/UnauthenticatedApp.tsx b/src/features/App/UnauthenticatedApp.tsx
index 1e704e83..ee37ef5f 100644
--- a/src/features/App/UnauthenticatedApp.tsx
+++ b/src/features/App/UnauthenticatedApp.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import {
   Route,
   Redirect,
diff --git a/src/features/App/index.tsx b/src/features/App/index.tsx
index 00190ac8..2ca52d2a 100644
--- a/src/features/App/index.tsx
+++ b/src/features/App/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Router } from 'react-router-dom'
 
 import { history } from 'config'
diff --git a/src/features/AuthStore/index.tsx b/src/features/AuthStore/index.tsx
index 01b76d01..e51504a5 100644
--- a/src/features/AuthStore/index.tsx
+++ b/src/features/AuthStore/index.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
+import {
   createContext,
   useContext,
   useState,
diff --git a/src/features/Background/index.tsx b/src/features/Background/index.tsx
index 5e14a7e2..4c6aabfe 100644
--- a/src/features/Background/index.tsx
+++ b/src/features/Background/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 
 import { GradientBackground, ImageBackground } from './styled'
 
diff --git a/src/features/Combobox/components/Arrow/index.tsx b/src/features/Combobox/components/Arrow/index.tsx
index 16ad7f5e..d87dbc94 100644
--- a/src/features/Combobox/components/Arrow/index.tsx
+++ b/src/features/Combobox/components/Arrow/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 type Props = {
diff --git a/src/features/Combobox/index.tsx b/src/features/Combobox/index.tsx
index 1123d578..aaa60374 100644
--- a/src/features/Combobox/index.tsx
+++ b/src/features/Combobox/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useRouteMatch } from 'react-router-dom'
 
 import isEmpty from 'lodash/isEmpty'
diff --git a/src/features/Common/Arrows/stories.tsx b/src/features/Common/Arrows/stories.tsx
index 855925c1..f99d3766 100644
--- a/src/features/Common/Arrows/stories.tsx
+++ b/src/features/Common/Arrows/stories.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ArrowLeft, ArrowRight } from 'features/Common'
 
 const Story = {
diff --git a/src/features/Common/Button/stories.tsx b/src/features/Common/Button/stories.tsx
index 311a62ad..6f96224b 100644
--- a/src/features/Common/Button/stories.tsx
+++ b/src/features/Common/Button/stories.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { action } from '@storybook/addon-actions'
 
 import { ButtonOutline, ButtonSolid } from 'features/Common'
diff --git a/src/features/Common/Checkbox/index.tsx b/src/features/Common/Checkbox/index.tsx
index 57f3968c..f4d1324d 100644
--- a/src/features/Common/Checkbox/index.tsx
+++ b/src/features/Common/Checkbox/index.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes } from 'react'
+import { InputHTMLAttributes } from 'react'
 
 import {
   Wrapper,
diff --git a/src/features/Common/Checkbox/stories.tsx b/src/features/Common/Checkbox/stories.tsx
index 251ecef3..ac9172eb 100644
--- a/src/features/Common/Checkbox/stories.tsx
+++ b/src/features/Common/Checkbox/stories.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Checkbox } from 'features/Common'
 
 const Story = {
diff --git a/src/features/Common/Image/index.tsx b/src/features/Common/Image/index.tsx
index aa1125a8..8fb790ee 100644
--- a/src/features/Common/Image/index.tsx
+++ b/src/features/Common/Image/index.tsx
@@ -1,5 +1,5 @@
 import type { BaseSyntheticEvent } from 'react'
-import React, { useCallback } from 'react'
+import { useCallback } from 'react'
 
 import styled from 'styled-components/macro'
 
diff --git a/src/features/Common/Input/index.tsx b/src/features/Common/Input/index.tsx
index 0308112d..a4c65069 100644
--- a/src/features/Common/Input/index.tsx
+++ b/src/features/Common/Input/index.tsx
@@ -1,5 +1,4 @@
 import type { ChangeEvent, FocusEvent } from 'react'
-import React from 'react'
 import { useRouteMatch } from 'react-router-dom'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/Common/Input/stories.tsx b/src/features/Common/Input/stories.tsx
index 39f5dc80..d5c6be72 100644
--- a/src/features/Common/Input/stories.tsx
+++ b/src/features/Common/Input/stories.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import { Input } from 'features/Common'
 
diff --git a/src/features/Common/Radio/index.tsx b/src/features/Common/Radio/index.tsx
index b87247fb..b7d91f8f 100644
--- a/src/features/Common/Radio/index.tsx
+++ b/src/features/Common/Radio/index.tsx
@@ -1,4 +1,4 @@
-import React, { InputHTMLAttributes } from 'react'
+import { InputHTMLAttributes } from 'react'
 import { useRouteMatch } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/Common/Radio/stories.tsx b/src/features/Common/Radio/stories.tsx
index 1ab304ff..020ebe84 100644
--- a/src/features/Common/Radio/stories.tsx
+++ b/src/features/Common/Radio/stories.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Radio } from 'features/Common'
 
 const Story = {
diff --git a/src/features/Common/SportName/index.tsx b/src/features/Common/SportName/index.tsx
index bb64b86d..ed7a4678 100644
--- a/src/features/Common/SportName/index.tsx
+++ b/src/features/Common/SportName/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { SportTypes } from 'config'
 
 import { getSportColor, getSportLexic } from 'helpers'
diff --git a/src/features/Common/StarIcon/index.tsx b/src/features/Common/StarIcon/index.tsx
index cdd535d6..5942348d 100644
--- a/src/features/Common/StarIcon/index.tsx
+++ b/src/features/Common/StarIcon/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 type StarProps = {
   fill: string,
 }
diff --git a/src/features/ExtendedSearchPage/components/DesktopHeader/index.tsx b/src/features/ExtendedSearchPage/components/DesktopHeader/index.tsx
index 936d00da..1f603fd9 100644
--- a/src/features/ExtendedSearchPage/components/DesktopHeader/index.tsx
+++ b/src/features/ExtendedSearchPage/components/DesktopHeader/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Menu } from 'features/Menu'
 import { LanguageSelect } from 'features/LanguageSelect'
 import {
diff --git a/src/features/ExtendedSearchPage/components/Filters/index.tsx b/src/features/ExtendedSearchPage/components/Filters/index.tsx
index 747093d7..5a2eb127 100644
--- a/src/features/ExtendedSearchPage/components/Filters/index.tsx
+++ b/src/features/ExtendedSearchPage/components/Filters/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import { SportTypeFilter } from '../SportTypeFilter'
 import { SearchInput } from '../SearchInput'
diff --git a/src/features/ExtendedSearchPage/components/GenderFilter/index.tsx b/src/features/ExtendedSearchPage/components/GenderFilter/index.tsx
index deadc86e..40e54049 100644
--- a/src/features/ExtendedSearchPage/components/GenderFilter/index.tsx
+++ b/src/features/ExtendedSearchPage/components/GenderFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Gender } from 'requests'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/ExtendedSearchPage/components/MobileHeader/index.tsx b/src/features/ExtendedSearchPage/components/MobileHeader/index.tsx
index 35c723b7..1a8b5b46 100644
--- a/src/features/ExtendedSearchPage/components/MobileHeader/index.tsx
+++ b/src/features/ExtendedSearchPage/components/MobileHeader/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 import { Link } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/ExtendedSearchPage/components/ProfileFilter/index.tsx b/src/features/ExtendedSearchPage/components/ProfileFilter/index.tsx
index 806202d1..ba22c549 100644
--- a/src/features/ExtendedSearchPage/components/ProfileFilter/index.tsx
+++ b/src/features/ExtendedSearchPage/components/ProfileFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ProfileTypes } from 'config'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/ExtendedSearchPage/components/Results/index.tsx b/src/features/ExtendedSearchPage/components/Results/index.tsx
index 8fe2169b..d396d375 100644
--- a/src/features/ExtendedSearchPage/components/Results/index.tsx
+++ b/src/features/ExtendedSearchPage/components/Results/index.tsx
@@ -1,7 +1,4 @@
-import React, {
-  Fragment,
-  memo,
-} from 'react'
+import { Fragment, memo } from 'react'
 
 import { isEmpty } from 'lodash'
 
diff --git a/src/features/ExtendedSearchPage/components/SearchInput/index.tsx b/src/features/ExtendedSearchPage/components/SearchInput/index.tsx
index 75e7de0e..0ce0a35c 100644
--- a/src/features/ExtendedSearchPage/components/SearchInput/index.tsx
+++ b/src/features/ExtendedSearchPage/components/SearchInput/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import styled from 'styled-components/macro'
 
diff --git a/src/features/ExtendedSearchPage/components/SportTypeFilter/index.tsx b/src/features/ExtendedSearchPage/components/SportTypeFilter/index.tsx
index 967488a0..08c06548 100644
--- a/src/features/ExtendedSearchPage/components/SportTypeFilter/index.tsx
+++ b/src/features/ExtendedSearchPage/components/SportTypeFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { SportTypeFilter as Filter } from 'features/SportTypeFilter'
 
 import { useExtendedSearchStore } from '../../store'
diff --git a/src/features/ExtendedSearchPage/index.tsx b/src/features/ExtendedSearchPage/index.tsx
index a236dcf4..46fd2f37 100644
--- a/src/features/ExtendedSearchPage/index.tsx
+++ b/src/features/ExtendedSearchPage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MediaQuery } from 'features/MediaQuery'
 import { UserFavorites } from 'features/UserFavorites'
 import { MainWrapper } from 'features/MainWrapper'
diff --git a/src/features/ExtendedSearchPage/store/index.tsx b/src/features/ExtendedSearchPage/store/index.tsx
index c30e4c5f..9c317fcc 100644
--- a/src/features/ExtendedSearchPage/store/index.tsx
+++ b/src/features/ExtendedSearchPage/store/index.tsx
@@ -1,8 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
-  createContext,
-  useContext,
-} from 'react'
+import { createContext, useContext } from 'react'
 
 import { useExtendedSearch } from './hooks'
 
diff --git a/src/features/FormStore/index.tsx b/src/features/FormStore/index.tsx
index e845b16c..5d652260 100644
--- a/src/features/FormStore/index.tsx
+++ b/src/features/FormStore/index.tsx
@@ -1,8 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
-  createContext,
-  useContext,
-} from 'react'
+import { createContext, useContext } from 'react'
 
 import { useFormState } from './hooks/useFormState'
 
diff --git a/src/features/Gender/index.tsx b/src/features/Gender/index.tsx
index a4695571..9d169687 100644
--- a/src/features/Gender/index.tsx
+++ b/src/features/Gender/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 import { Gender } from 'requests'
diff --git a/src/features/GlobalStores/index.tsx b/src/features/GlobalStores/index.tsx
index 0ee68352..f6ef3bbe 100644
--- a/src/features/GlobalStores/index.tsx
+++ b/src/features/GlobalStores/index.tsx
@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react'
+import { ReactNode } from 'react'
 
 import { AuthStore } from 'features/AuthStore'
 import { LexicsStore } from 'features/LexicsStore'
diff --git a/src/features/HeaderFilters/components/DateFilter/index.tsx b/src/features/HeaderFilters/components/DateFilter/index.tsx
index 7dc681c7..83c3c409 100644
--- a/src/features/HeaderFilters/components/DateFilter/index.tsx
+++ b/src/features/HeaderFilters/components/DateFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { OutsideClick } from 'features/OutsideClick'
 
 import { useDateFilter } from './hooks'
diff --git a/src/features/HeaderFilters/components/DatePicker/index.tsx b/src/features/HeaderFilters/components/DatePicker/index.tsx
index 5560e24c..cbf86d05 100644
--- a/src/features/HeaderFilters/components/DatePicker/index.tsx
+++ b/src/features/HeaderFilters/components/DatePicker/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import type { ReactDatePickerProps } from 'react-datepicker'
 import DatePickerComponent from 'react-datepicker'
 import 'react-datepicker/dist/react-datepicker.css'
diff --git a/src/features/HeaderFilters/components/MatchStatusFilter/index.tsx b/src/features/HeaderFilters/components/MatchStatusFilter/index.tsx
index 5ea763a1..4379d1c2 100644
--- a/src/features/HeaderFilters/components/MatchStatusFilter/index.tsx
+++ b/src/features/HeaderFilters/components/MatchStatusFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { T9n } from 'features/T9n'
 import {
   RadioButtonGroup,
diff --git a/src/features/HeaderFilters/components/SportTypeFilter/index.tsx b/src/features/HeaderFilters/components/SportTypeFilter/index.tsx
index 55498e5d..b70c0cf9 100644
--- a/src/features/HeaderFilters/components/SportTypeFilter/index.tsx
+++ b/src/features/HeaderFilters/components/SportTypeFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { css } from 'styled-components/macro'
 
 import { devices } from 'config'
diff --git a/src/features/HeaderFilters/components/TournamentFilter/index.tsx b/src/features/HeaderFilters/components/TournamentFilter/index.tsx
index f29a3bab..4907d413 100644
--- a/src/features/HeaderFilters/components/TournamentFilter/index.tsx
+++ b/src/features/HeaderFilters/components/TournamentFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { T9n } from 'features/T9n'
 import { Name } from 'features/Name'
 import { OutsideClick } from 'features/OutsideClick'
diff --git a/src/features/HeaderFilters/components/TournamentList/index.tsx b/src/features/HeaderFilters/components/TournamentList/index.tsx
index 2c43a364..69861ca5 100644
--- a/src/features/HeaderFilters/components/TournamentList/index.tsx
+++ b/src/features/HeaderFilters/components/TournamentList/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import type { Tournaments } from 'requests'
diff --git a/src/features/HeaderFilters/store/index.tsx b/src/features/HeaderFilters/store/index.tsx
index b146fa0a..bdedbd41 100644
--- a/src/features/HeaderFilters/store/index.tsx
+++ b/src/features/HeaderFilters/store/index.tsx
@@ -1,8 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
-  useContext,
-  createContext,
-} from 'react'
+import { useContext, createContext } from 'react'
 
 import { useFilters } from './hooks'
 
diff --git a/src/features/HeaderMobile/index.tsx b/src/features/HeaderMobile/index.tsx
index 84fb5f7f..678e26a4 100644
--- a/src/features/HeaderMobile/index.tsx
+++ b/src/features/HeaderMobile/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Link, useRouteMatch } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/HomePage/components/Header/index.tsx b/src/features/HomePage/components/Header/index.tsx
index bad49729..4c621aea 100644
--- a/src/features/HomePage/components/Header/index.tsx
+++ b/src/features/HomePage/components/Header/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Menu } from 'features/Menu'
 import { LanguageSelect } from 'features/LanguageSelect'
 import { ScoreSwitch, AvailableMatchesSwitch } from 'features/MatchSwitches'
diff --git a/src/features/HomePage/index.tsx b/src/features/HomePage/index.tsx
index 641e74c3..65460d67 100644
--- a/src/features/HomePage/index.tsx
+++ b/src/features/HomePage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { MediaQuery } from 'features/MediaQuery'
 import { HeaderMobile } from 'features/HeaderMobile'
 import { Matches } from 'features/Matches'
diff --git a/src/features/InfiniteScroll/index.tsx b/src/features/InfiniteScroll/index.tsx
index 3f2cc50f..e1a1ce4e 100644
--- a/src/features/InfiniteScroll/index.tsx
+++ b/src/features/InfiniteScroll/index.tsx
@@ -1,5 +1,4 @@
 import type { ReactNode } from 'react'
-import React from 'react'
 
 import { useIntersectionObserver } from './hooks'
 import { Root, Target } from './styled'
diff --git a/src/features/ItemsList/index.tsx b/src/features/ItemsList/index.tsx
index 8ff650cb..6930f56d 100644
--- a/src/features/ItemsList/index.tsx
+++ b/src/features/ItemsList/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import { SportTypes, ProfileTypes } from 'config'
diff --git a/src/features/LanguageSelect/index.tsx b/src/features/LanguageSelect/index.tsx
index ae072139..b364603f 100644
--- a/src/features/LanguageSelect/index.tsx
+++ b/src/features/LanguageSelect/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import { useLexicsStore } from 'features/LexicsStore'
diff --git a/src/features/LexicsStore/index.tsx b/src/features/LexicsStore/index.tsx
index 15e9bc14..9622b850 100644
--- a/src/features/LexicsStore/index.tsx
+++ b/src/features/LexicsStore/index.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
+import {
   createContext,
   useContext,
   useEffect,
diff --git a/src/features/Loader/index.tsx b/src/features/Loader/index.tsx
index f6089339..c849ab4a 100644
--- a/src/features/Loader/index.tsx
+++ b/src/features/Loader/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { LoaderProps } from './types'
 import { Wrapper, Circles } from './styled'
 
diff --git a/src/features/Login/index.tsx b/src/features/Login/index.tsx
index 4de0ca05..c021d132 100644
--- a/src/features/Login/index.tsx
+++ b/src/features/Login/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { PAGES } from 'config'
 import { formIds } from 'config/form'
 
diff --git a/src/features/MatchCard/CardFinished/index.tsx b/src/features/MatchCard/CardFinished/index.tsx
index d6a4b0fd..30d4849f 100644
--- a/src/features/MatchCard/CardFinished/index.tsx
+++ b/src/features/MatchCard/CardFinished/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import type { Match } from 'features/Matches'
 
 import { useCard } from '../hooks'
diff --git a/src/features/MatchCard/CardFinishedHover/index.tsx b/src/features/MatchCard/CardFinishedHover/index.tsx
index 40a2e59d..cec2ec69 100644
--- a/src/features/MatchCard/CardFinishedHover/index.tsx
+++ b/src/features/MatchCard/CardFinishedHover/index.tsx
@@ -1,5 +1,4 @@
 import type { MouseEvent } from 'react'
-import React from 'react'
 
 import { Link } from 'react-router-dom'
 
diff --git a/src/features/MatchCard/CardLive/index.tsx b/src/features/MatchCard/CardLive/index.tsx
index 241f4348..64e35078 100644
--- a/src/features/MatchCard/CardLive/index.tsx
+++ b/src/features/MatchCard/CardLive/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import type { Match } from 'features/Matches'
 
 import { useCard } from '../hooks'
diff --git a/src/features/MatchCard/CardLiveHover/index.tsx b/src/features/MatchCard/CardLiveHover/index.tsx
index b5c1b3fe..518f528e 100644
--- a/src/features/MatchCard/CardLiveHover/index.tsx
+++ b/src/features/MatchCard/CardLiveHover/index.tsx
@@ -1,5 +1,4 @@
 import type { MouseEvent } from 'react'
-import React from 'react'
 
 import { Link } from 'react-router-dom'
 
diff --git a/src/features/MatchCard/CardSoon/index.tsx b/src/features/MatchCard/CardSoon/index.tsx
index b330b403..55c318b8 100644
--- a/src/features/MatchCard/CardSoon/index.tsx
+++ b/src/features/MatchCard/CardSoon/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 import { ProfileTypes } from 'config'
diff --git a/src/features/MatchCard/MatchInfoCard/index.tsx b/src/features/MatchCard/MatchInfoCard/index.tsx
index e3cc2b0e..27c17d0a 100644
--- a/src/features/MatchCard/MatchInfoCard/index.tsx
+++ b/src/features/MatchCard/MatchInfoCard/index.tsx
@@ -1,5 +1,4 @@
 import type { KeyboardEvent } from 'react'
-import React from 'react'
 
 import { ProfileTypes } from 'config'
 
diff --git a/src/features/MatchCard/index.tsx b/src/features/MatchCard/index.tsx
index 27900a6e..44ee2e1f 100644
--- a/src/features/MatchCard/index.tsx
+++ b/src/features/MatchCard/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useRouteMatch } from 'react-router'
 
 import { PAGES } from 'config'
diff --git a/src/features/MatchPage/MatchProfileCard/index.tsx b/src/features/MatchPage/MatchProfileCard/index.tsx
index 545c8c5a..206c1be2 100644
--- a/src/features/MatchPage/MatchProfileCard/index.tsx
+++ b/src/features/MatchPage/MatchProfileCard/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import format from 'date-fns/format'
 
 import type { MatchInfo } from 'requests'
diff --git a/src/features/MatchPage/index.tsx b/src/features/MatchPage/index.tsx
index 228904ab..e2561ed7 100644
--- a/src/features/MatchPage/index.tsx
+++ b/src/features/MatchPage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import isEmpty from 'lodash/isEmpty'
 
 import { StreamPlayer } from 'features/StreamPlayer'
diff --git a/src/features/MatchSwitches/components/AvailableMatchesSwitch/index.tsx b/src/features/MatchSwitches/components/AvailableMatchesSwitch/index.tsx
index 5bb0a56a..e55e095a 100644
--- a/src/features/MatchSwitches/components/AvailableMatchesSwitch/index.tsx
+++ b/src/features/MatchSwitches/components/AvailableMatchesSwitch/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 import { Tooltip, TooltipWrapper } from 'features/Tooltip'
diff --git a/src/features/MatchSwitches/components/ScoreSwitch/index.tsx b/src/features/MatchSwitches/components/ScoreSwitch/index.tsx
index d34c2253..71e88a36 100644
--- a/src/features/MatchSwitches/components/ScoreSwitch/index.tsx
+++ b/src/features/MatchSwitches/components/ScoreSwitch/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 import { useMatchSwitchesStore } from 'features/MatchSwitches'
diff --git a/src/features/MatchSwitches/store.tsx b/src/features/MatchSwitches/store.tsx
index 82675b5e..69136aba 100644
--- a/src/features/MatchSwitches/store.tsx
+++ b/src/features/MatchSwitches/store.tsx
@@ -1,8 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
-  createContext,
-  useContext,
-} from 'react'
+import { createContext, useContext } from 'react'
 
 import { useMatchSwitches } from './hooks'
 
diff --git a/src/features/Matches/components/MatchesList/index.tsx b/src/features/Matches/components/MatchesList/index.tsx
index 73acdd1c..6809cac8 100644
--- a/src/features/Matches/components/MatchesList/index.tsx
+++ b/src/features/Matches/components/MatchesList/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import isEmpty from 'lodash/isEmpty'
 
diff --git a/src/features/Matches/index.tsx b/src/features/Matches/index.tsx
index 14cc2a5f..b3288fa3 100644
--- a/src/features/Matches/index.tsx
+++ b/src/features/Matches/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import { InfiniteScroll } from 'features/InfiniteScroll'
 import { Loading } from 'features/HomePage/styled'
diff --git a/src/features/MatchesGrid/index.tsx b/src/features/MatchesGrid/index.tsx
index 95d219d4..a7168924 100644
--- a/src/features/MatchesGrid/index.tsx
+++ b/src/features/MatchesGrid/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import type { Match } from 'features/Matches'
diff --git a/src/features/MatchesSlider/index.tsx b/src/features/MatchesSlider/index.tsx
index e5361c18..b5b27988 100644
--- a/src/features/MatchesSlider/index.tsx
+++ b/src/features/MatchesSlider/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 import isEmpty from 'lodash/isEmpty'
 
diff --git a/src/features/Menu/index.tsx b/src/features/Menu/index.tsx
index 8f747531..1035e217 100644
--- a/src/features/Menu/index.tsx
+++ b/src/features/Menu/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Link, useRouteMatch } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/Modal/index.tsx b/src/features/Modal/index.tsx
index 87ee397a..7a5b53e1 100644
--- a/src/features/Modal/index.tsx
+++ b/src/features/Modal/index.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react'
-import React, { useRef } from 'react'
+import { useRef } from 'react'
 import ReactDOM from 'react-dom'
 
 import { OutsideClick } from 'features/OutsideClick'
diff --git a/src/features/MultiSourcePlayer/components/Chapters/index.tsx b/src/features/MultiSourcePlayer/components/Chapters/index.tsx
index 5a5ea594..bde90511 100644
--- a/src/features/MultiSourcePlayer/components/Chapters/index.tsx
+++ b/src/features/MultiSourcePlayer/components/Chapters/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import {
diff --git a/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx b/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx
index cac206b9..3834fdc2 100644
--- a/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx
+++ b/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { secondsToHms } from 'helpers'
 
 import { useSlider } from 'features/StreamPlayer/hooks/useSlider'
diff --git a/src/features/MultiSourcePlayer/components/ProgressBar/stories.tsx b/src/features/MultiSourcePlayer/components/ProgressBar/stories.tsx
index 4fa8c6ba..bde11feb 100644
--- a/src/features/MultiSourcePlayer/components/ProgressBar/stories.tsx
+++ b/src/features/MultiSourcePlayer/components/ProgressBar/stories.tsx
@@ -1,5 +1,4 @@
 import type { ReactElement } from 'react'
-import React from 'react'
 
 import styled from 'styled-components/macro'
 
diff --git a/src/features/MultiSourcePlayer/components/Settings/index.tsx b/src/features/MultiSourcePlayer/components/Settings/index.tsx
index 2e021ff6..6719cbc3 100644
--- a/src/features/MultiSourcePlayer/components/Settings/index.tsx
+++ b/src/features/MultiSourcePlayer/components/Settings/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import map from 'lodash/map'
 
diff --git a/src/features/MultiSourcePlayer/index.tsx b/src/features/MultiSourcePlayer/index.tsx
index 1f9c3d6a..37522a4d 100644
--- a/src/features/MultiSourcePlayer/index.tsx
+++ b/src/features/MultiSourcePlayer/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { VolumeBar } from 'features/StreamPlayer/components/VolumeBar'
 import {
   PlayerWrapper,
diff --git a/src/features/Name/index.tsx b/src/features/Name/index.tsx
index 62aae2ef..ce411492 100644
--- a/src/features/Name/index.tsx
+++ b/src/features/Name/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import styled from 'styled-components/macro'
 
 import { useLexicsStore } from 'features/LexicsStore'
diff --git a/src/features/OutsideClick/index.tsx b/src/features/OutsideClick/index.tsx
index 936b2a95..4831eeef 100644
--- a/src/features/OutsideClick/index.tsx
+++ b/src/features/OutsideClick/index.tsx
@@ -1,5 +1,4 @@
 import type { ReactNode } from 'react'
-import React from 'react'
 
 import styled from 'styled-components'
 
diff --git a/src/features/PlayerPage/index.tsx b/src/features/PlayerPage/index.tsx
index 42e6084b..28258806 100644
--- a/src/features/PlayerPage/index.tsx
+++ b/src/features/PlayerPage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ProfileTypes } from 'config'
 
 import { ProfileHeader } from 'features/ProfileHeader'
diff --git a/src/features/ProfileCard/index.tsx b/src/features/ProfileCard/index.tsx
index f99cdfb2..89917642 100644
--- a/src/features/ProfileCard/index.tsx
+++ b/src/features/ProfileCard/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/ProfileHeader/index.tsx b/src/features/ProfileHeader/index.tsx
index bc040201..016f2bf6 100644
--- a/src/features/ProfileHeader/index.tsx
+++ b/src/features/ProfileHeader/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 import { useRouteMatch } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/ProfileLink/index.tsx b/src/features/ProfileLink/index.tsx
index e57ec24f..182cffe1 100644
--- a/src/features/ProfileLink/index.tsx
+++ b/src/features/ProfileLink/index.tsx
@@ -1,5 +1,4 @@
 import type { ReactNode, MouseEvent } from 'react'
-import React from 'react'
 import { Link } from 'react-router-dom'
 
 import { ProfileTypes, SportTypes } from 'config'
diff --git a/src/features/ProfileLogo/index.tsx b/src/features/ProfileLogo/index.tsx
index 0d4b8f35..517f759d 100644
--- a/src/features/ProfileLogo/index.tsx
+++ b/src/features/ProfileLogo/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ProfileTypes, SportTypes } from 'config'
 import { getProfileFallbackLogo, getProfileLogo } from 'helpers'
 
diff --git a/src/features/Register/components/AdditionalSubscription/index.tsx b/src/features/Register/components/AdditionalSubscription/index.tsx
index 30d10cd4..9d9d5437 100644
--- a/src/features/Register/components/AdditionalSubscription/index.tsx
+++ b/src/features/Register/components/AdditionalSubscription/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Checkbox } from 'features/Common'
 
 import { Price } from '../Price'
diff --git a/src/features/Register/components/CardStep/index.tsx b/src/features/Register/components/CardStep/index.tsx
index 69c07e01..91dee12d 100644
--- a/src/features/Register/components/CardStep/index.tsx
+++ b/src/features/Register/components/CardStep/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { T9n } from 'features/T9n'
 import { Input, ButtonSolid } from 'features/Common'
 import {
diff --git a/src/features/Register/components/MainSubscription/index.tsx b/src/features/Register/components/MainSubscription/index.tsx
index 5d235b25..419b1886 100644
--- a/src/features/Register/components/MainSubscription/index.tsx
+++ b/src/features/Register/components/MainSubscription/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Radio } from 'features/Common'
 
 import { Price } from '../Price'
diff --git a/src/features/Register/components/Price/index.tsx b/src/features/Register/components/Price/index.tsx
index c92fe9dd..fad97f58 100644
--- a/src/features/Register/components/Price/index.tsx
+++ b/src/features/Register/components/Price/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { useLexicsStore } from 'features/LexicsStore'
 
 import {
diff --git a/src/features/Register/components/RegistrationStep/index.tsx b/src/features/Register/components/RegistrationStep/index.tsx
index 72855104..15c789b8 100644
--- a/src/features/Register/components/RegistrationStep/index.tsx
+++ b/src/features/Register/components/RegistrationStep/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { formIds } from 'config/form'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/Register/components/RegistrationSuccessful/index.tsx b/src/features/Register/components/RegistrationSuccessful/index.tsx
index 9ba9d46f..d02f019c 100644
--- a/src/features/Register/components/RegistrationSuccessful/index.tsx
+++ b/src/features/Register/components/RegistrationSuccessful/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { PAGES } from 'config'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/Register/components/SubscriptionsStep/index.tsx b/src/features/Register/components/SubscriptionsStep/index.tsx
index 7a5cf418..77c41994 100644
--- a/src/features/Register/components/SubscriptionsStep/index.tsx
+++ b/src/features/Register/components/SubscriptionsStep/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 import { useRouteMatch } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/Register/index.tsx b/src/features/Register/index.tsx
index dc15dfeb..58adbec0 100644
--- a/src/features/Register/index.tsx
+++ b/src/features/Register/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Route } from 'react-router'
 import { useRouteMatch } from 'react-router-dom'
 
diff --git a/src/features/Search/components/Header/index.tsx b/src/features/Search/components/Header/index.tsx
index eb64ce53..ad986efd 100644
--- a/src/features/Search/components/Header/index.tsx
+++ b/src/features/Search/components/Header/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import {
   Wrapper,
   Icon,
diff --git a/src/features/Search/index.tsx b/src/features/Search/index.tsx
index 7f4fb781..1024df64 100644
--- a/src/features/Search/index.tsx
+++ b/src/features/Search/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 import { useRouteMatch } from 'react-router-dom'
 import isEmpty from 'lodash/isEmpty'
 
diff --git a/src/features/SportTypeFilter/index.tsx b/src/features/SportTypeFilter/index.tsx
index 09b70b76..ac817209 100644
--- a/src/features/SportTypeFilter/index.tsx
+++ b/src/features/SportTypeFilter/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import { T9n } from 'features/T9n'
diff --git a/src/features/StreamPlayer/components/ProgressBar/index.tsx b/src/features/StreamPlayer/components/ProgressBar/index.tsx
index 8e5c7193..1260e4e8 100644
--- a/src/features/StreamPlayer/components/ProgressBar/index.tsx
+++ b/src/features/StreamPlayer/components/ProgressBar/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { secondsToHms } from 'helpers'
 
 import { useSlider } from 'features/StreamPlayer/hooks/useSlider'
diff --git a/src/features/StreamPlayer/components/ProgressBar/stories.tsx b/src/features/StreamPlayer/components/ProgressBar/stories.tsx
index 03c47c28..63a73dd1 100644
--- a/src/features/StreamPlayer/components/ProgressBar/stories.tsx
+++ b/src/features/StreamPlayer/components/ProgressBar/stories.tsx
@@ -1,5 +1,4 @@
 import type { ReactElement } from 'react'
-import React from 'react'
 
 import styled from 'styled-components/macro'
 
diff --git a/src/features/StreamPlayer/components/TimeTooltip/index.tsx b/src/features/StreamPlayer/components/TimeTooltip/index.tsx
index 3738043a..b20b3b13 100644
--- a/src/features/StreamPlayer/components/TimeTooltip/index.tsx
+++ b/src/features/StreamPlayer/components/TimeTooltip/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Wrapper, Time } from './styled'
 
 type Props = {
diff --git a/src/features/StreamPlayer/components/VolumeBar/index.tsx b/src/features/StreamPlayer/components/VolumeBar/index.tsx
index 7196544c..4a315a48 100644
--- a/src/features/StreamPlayer/components/VolumeBar/index.tsx
+++ b/src/features/StreamPlayer/components/VolumeBar/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { useSlider } from 'features/StreamPlayer/hooks/useSlider'
 
 import {
diff --git a/src/features/StreamPlayer/index.tsx b/src/features/StreamPlayer/index.tsx
index ada4ebe4..fcd7e6f3 100644
--- a/src/features/StreamPlayer/index.tsx
+++ b/src/features/StreamPlayer/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Settings } from 'features/MultiSourcePlayer/components/Settings'
 
 import type { Props } from './hooks'
diff --git a/src/features/T9n/index.tsx b/src/features/T9n/index.tsx
index 4e40ee82..6e066233 100644
--- a/src/features/T9n/index.tsx
+++ b/src/features/T9n/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import styled from 'styled-components/macro'
 
 import { useLexicsStore } from 'features/LexicsStore'
diff --git a/src/features/TeamPage/index.tsx b/src/features/TeamPage/index.tsx
index 34d22eea..527949ec 100644
--- a/src/features/TeamPage/index.tsx
+++ b/src/features/TeamPage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ProfileTypes } from 'config'
 
 import { ProfileHeader } from 'features/ProfileHeader'
diff --git a/src/features/Theme/index.tsx b/src/features/Theme/index.tsx
index ee8511c0..1ce1ed9d 100644
--- a/src/features/Theme/index.tsx
+++ b/src/features/Theme/index.tsx
@@ -1,4 +1,4 @@
-import React, {
+import {
   useState,
   ReactNode,
   useCallback,
diff --git a/src/features/Tooltip/index.tsx b/src/features/Tooltip/index.tsx
index e0b27799..96ad3396 100644
--- a/src/features/Tooltip/index.tsx
+++ b/src/features/Tooltip/index.tsx
@@ -1,5 +1,5 @@
 import type { ReactNode } from 'react'
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import styled from 'styled-components/macro'
 
diff --git a/src/features/TournamentPage/index.tsx b/src/features/TournamentPage/index.tsx
index cce1a1f0..15b37c34 100644
--- a/src/features/TournamentPage/index.tsx
+++ b/src/features/TournamentPage/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { ProfileTypes } from 'config'
 
 import { ProfileHeader } from 'features/ProfileHeader'
diff --git a/src/features/UserAccount/components/CardNumber/index.tsx b/src/features/UserAccount/components/CardNumber/index.tsx
index c2371b68..fc5f5e93 100644
--- a/src/features/UserAccount/components/CardNumber/index.tsx
+++ b/src/features/UserAccount/components/CardNumber/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Radio } from 'features/Common/Radio'
 import { T9n } from 'features/T9n'
 
diff --git a/src/features/UserAccount/components/PageTitle/index.tsx b/src/features/UserAccount/components/PageTitle/index.tsx
index 08705830..bc7661df 100644
--- a/src/features/UserAccount/components/PageTitle/index.tsx
+++ b/src/features/UserAccount/components/PageTitle/index.tsx
@@ -1,4 +1,3 @@
-import React from 'react'
 import { Link, useLocation } from 'react-router-dom'
 
 import { PAGES } from 'config'
diff --git a/src/features/UserAccount/components/Subscription/index.tsx b/src/features/UserAccount/components/Subscription/index.tsx
index 6b8cbeb1..83c69368 100644
--- a/src/features/UserAccount/components/Subscription/index.tsx
+++ b/src/features/UserAccount/components/Subscription/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Price } from 'features/Register/components/Price'
 import { Radio } from 'features/Common/Radio'
 import { Checkbox } from 'features/Common/Checkbox'
diff --git a/src/features/UserAccount/components/SubscriptionsForm/index.tsx b/src/features/UserAccount/components/SubscriptionsForm/index.tsx
index c6397c19..9974933e 100644
--- a/src/features/UserAccount/components/SubscriptionsForm/index.tsx
+++ b/src/features/UserAccount/components/SubscriptionsForm/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import map from 'lodash/map'
 import isNumber from 'lodash/isNumber'
diff --git a/src/features/UserAccount/components/SubscriptionsModal/index.tsx b/src/features/UserAccount/components/SubscriptionsModal/index.tsx
index e9a360cc..8af8d061 100644
--- a/src/features/UserAccount/components/SubscriptionsModal/index.tsx
+++ b/src/features/UserAccount/components/SubscriptionsModal/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import map from 'lodash/map'
 
 import type { SubscriptionType } from 'requests/getSubscriptions'
diff --git a/src/features/UserAccount/components/TextNoBorder/index.tsx b/src/features/UserAccount/components/TextNoBorder/index.tsx
index 28e77112..65759aff 100644
--- a/src/features/UserAccount/components/TextNoBorder/index.tsx
+++ b/src/features/UserAccount/components/TextNoBorder/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { Price } from 'features/Register/components/Price'
 
 import { TextNoBorderWrapper, TextNoBorderTextWrapper } from './styled'
diff --git a/src/features/UserAccount/components/UserAccountButton/index.tsx b/src/features/UserAccount/components/UserAccountButton/index.tsx
index ea66638c..c7611fe5 100644
--- a/src/features/UserAccount/components/UserAccountButton/index.tsx
+++ b/src/features/UserAccount/components/UserAccountButton/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { T9n } from 'features/T9n'
 
 import { PlusIconWrapper } from '../PlusIcon'
diff --git a/src/features/UserAccount/components/UserAccountSubscription/index.tsx b/src/features/UserAccount/components/UserAccountSubscription/index.tsx
index c14fe622..cee2e7a9 100644
--- a/src/features/UserAccount/components/UserAccountSubscription/index.tsx
+++ b/src/features/UserAccount/components/UserAccountSubscription/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { T9n } from 'features/T9n'
 import type { ObjectWithName } from 'features/Name'
 import { Name } from 'features/Name'
diff --git a/src/features/UserAccount/components/UserAccountSubscriptionMatch/index.tsx b/src/features/UserAccount/components/UserAccountSubscriptionMatch/index.tsx
index 61575e7f..9d06e07c 100644
--- a/src/features/UserAccount/components/UserAccountSubscriptionMatch/index.tsx
+++ b/src/features/UserAccount/components/UserAccountSubscriptionMatch/index.tsx
@@ -1,4 +1,4 @@
-import React, { Fragment } from 'react'
+import { Fragment } from 'react'
 
 import format from 'date-fns/format'
 
diff --git a/src/features/UserAccount/index.tsx b/src/features/UserAccount/index.tsx
index 1ac8c5c2..a8ffca19 100644
--- a/src/features/UserAccount/index.tsx
+++ b/src/features/UserAccount/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { userAccountLexics } from 'config/lexics/userAccount'
 import { formIds } from 'config/form'
 
diff --git a/src/features/UserFavorites/TooltipBlock/index.tsx b/src/features/UserFavorites/TooltipBlock/index.tsx
index fb7d814a..f8ea89ea 100644
--- a/src/features/UserFavorites/TooltipBlock/index.tsx
+++ b/src/features/UserFavorites/TooltipBlock/index.tsx
@@ -1,5 +1,3 @@
-import React from 'react'
-
 import { UserFavorite } from 'requests'
 
 import { Name, useName } from 'features/Name'
diff --git a/src/features/UserFavorites/index.tsx b/src/features/UserFavorites/index.tsx
index 536a4613..0d8b40fd 100644
--- a/src/features/UserFavorites/index.tsx
+++ b/src/features/UserFavorites/index.tsx
@@ -1,5 +1,5 @@
 import type { MouseEvent, FocusEvent } from 'react'
-import React, { useState } from 'react'
+import { useState } from 'react'
 import { Link } from 'react-router-dom'
 
 import map from 'lodash/map'
diff --git a/src/features/UserFavorites/store/index.tsx b/src/features/UserFavorites/store/index.tsx
index 26c11b36..f3afee01 100644
--- a/src/features/UserFavorites/store/index.tsx
+++ b/src/features/UserFavorites/store/index.tsx
@@ -1,8 +1,5 @@
 import type { ReactNode } from 'react'
-import React, {
-  useContext,
-  createContext,
-} from 'react'
+import { useContext, createContext } from 'react'
 
 import { useUserFavorites } from '../hooks'
 
diff --git a/src/features/VideoPlayer/index.tsx b/src/features/VideoPlayer/index.tsx
index c3f1aa1f..a5953ee4 100644
--- a/src/features/VideoPlayer/index.tsx
+++ b/src/features/VideoPlayer/index.tsx
@@ -1,4 +1,4 @@
-import React, { forwardRef } from 'react'
+import { forwardRef } from 'react'
 
 import type { Props } from './hooks'
 import { useVideoPlayer } from './hooks'
diff --git a/src/index.tsx b/src/index.tsx
index 519bd6e4..c40fa88c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import { StrictMode } from 'react'
 import ReactDOM from 'react-dom'
 
 import { App } from 'features/App'
@@ -6,9 +6,9 @@ import { App } from 'features/App'
 import * as serviceWorker from './serviceWorker'
 
 ReactDOM.render(
-  <React.StrictMode>
+  <StrictMode>
     <App />
-  </React.StrictMode>,
+  </StrictMode>,
   document.getElementById('root'),
 )
 
diff --git a/tsconfig.json b/tsconfig.json
index cd9e3b50..9021894b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -18,7 +18,7 @@
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,
-    "jsx": "react",
+    "jsx": "react-jsx",
     "noUnusedLocals": true,
     "noFallthroughCasesInSwitch": true
   },