diff --git a/src/ui/LangMenu/LangMenu.container.js b/src/ui/LangMenu/LangMenu.container.js
deleted file mode 100644
index 36957597a..000000000
--- a/src/ui/LangMenu/LangMenu.container.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { connect } from 'react-redux'
-
-import { setLang } from 'state/base/actions'
-import { getLocale } from 'state/base/selectors'
-
-import LangMenu from './LangMenu'
-
-const mapStateToProps = state => ({
-  value: getLocale(state),
-})
-
-const mapDispatchToProps = {
-  setLang,
-}
-
-const LangMenuContainer = connect(mapStateToProps, mapDispatchToProps)(LangMenu)
-
-export default LangMenuContainer
diff --git a/src/ui/LangMenu/LangMenu.js b/src/ui/LangMenu/LangMenu.js
index b01f6e09d..60f14e5d3 100644
--- a/src/ui/LangMenu/LangMenu.js
+++ b/src/ui/LangMenu/LangMenu.js
@@ -1,30 +1,33 @@
-import React from 'react'
+import React, { useCallback } from 'react'
+import { useDispatch, useSelector } from 'react-redux'
 import _map from 'lodash/map'
 import _keys from 'lodash/keys'
 
 import Select from 'ui/Select'
+import { setLang } from 'state/base/actions'
 import { LANGUAGE_NAMES } from 'locales/i18n'
-
-import { propTypes, defaultProps } from './LangMenu.props'
+import { getLocale } from 'state/base/selectors'
 
 const items = _map(_keys(LANGUAGE_NAMES), (lang) => ({ value: lang, label: LANGUAGE_NAMES[lang] }))
 
-const LangMenu = (props) => {
-  const { setLang, value } = props
+const LangMenu = () => {
+  const dispatch = useDispatch()
+  const currentValue = useSelector(getLocale)
+
+  const handleChange = useCallback((value) => {
+    dispatch(setLang(value))
+  }, [dispatch])
 
   return (
     <Select
-      className='bitfinex-select--language'
-      popoverClassName='bitfinex-select-menu--language'
-      value={value}
       items={items}
-      onChange={setLang}
       type={'Language'}
+      value={currentValue}
+      onChange={handleChange}
+      className='bitfinex-select--language'
+      popoverClassName='bitfinex-select-menu--language'
     />
   )
 }
 
-LangMenu.propTypes = propTypes
-LangMenu.defaultProps = defaultProps
-
 export default LangMenu
diff --git a/src/ui/LangMenu/LangMenu.props.js b/src/ui/LangMenu/LangMenu.props.js
deleted file mode 100644
index 10cef93d3..000000000
--- a/src/ui/LangMenu/LangMenu.props.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import PropTypes from 'prop-types'
-
-export const propTypes = {
-  value: PropTypes.string.isRequired,
-  setLang: PropTypes.func.isRequired,
-}
-
-export const defaultProps = {}
diff --git a/src/ui/LangMenu/index.js b/src/ui/LangMenu/index.js
index 5a02526aa..52abf3d79 100644
--- a/src/ui/LangMenu/index.js
+++ b/src/ui/LangMenu/index.js
@@ -1,3 +1 @@
-import LangMenu from './LangMenu.container'
-
-export default LangMenu
+export { default } from './LangMenu'