diff --git a/app/presentation/DirectoryItem/index.tsx b/app/presentation/DirectoryItem/index.tsx
index 2b2708f61..1e4d5ccf9 100644
--- a/app/presentation/DirectoryItem/index.tsx
+++ b/app/presentation/DirectoryItem/index.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { Text, View } from 'react-native';
-import PropTypes from 'prop-types';
 
 import Touch from '../../utils/touch';
 import Avatar from '../../containers/Avatar';
diff --git a/app/presentation/ImageViewer/ImageViewer.android.tsx b/app/presentation/ImageViewer/ImageViewer.android.tsx
index c458143c3..ff5fbc138 100644
--- a/app/presentation/ImageViewer/ImageViewer.android.tsx
+++ b/app/presentation/ImageViewer/ImageViewer.android.tsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import { StyleSheet, View } from 'react-native';
-import PropTypes from 'prop-types';
 import { PanGestureHandler, State, PinchGestureHandler } from 'react-native-gesture-handler';
 import Animated, { Easing } from 'react-native-reanimated';
 import { ImageComponent } from './ImageComponent';
@@ -256,10 +255,11 @@ function bouncy(
 const WIDTH = 300;
 const HEIGHT = 300;
 
-class Image extends React.PureComponent {
-	static propTypes = {
-		imageComponentType: PropTypes.string
-	}
+interface IImageProps {
+	imageComponentType: string
+}
+
+class Image extends React.PureComponent<IImageProps, any> {
 
 	render() {
 		const { imageComponentType }: any = this.props;
diff --git a/app/presentation/RoomItem/RoomItem.tsx b/app/presentation/RoomItem/RoomItem.tsx
index 310b0332b..6c8a58707 100644
--- a/app/presentation/RoomItem/RoomItem.tsx
+++ b/app/presentation/RoomItem/RoomItem.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { View } from 'react-native';
 
 import styles from './styles';
diff --git a/app/presentation/RoomItem/Touchable.tsx b/app/presentation/RoomItem/Touchable.tsx
index 72bd035ab..106f0cb33 100644
--- a/app/presentation/RoomItem/Touchable.tsx
+++ b/app/presentation/RoomItem/Touchable.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { Animated } from 'react-native';
 import {
 	LongPressGestureHandler, PanGestureHandler, State
diff --git a/app/presentation/RoomItem/index.tsx b/app/presentation/RoomItem/index.tsx
index 612f12c96..2116a5b8a 100644
--- a/app/presentation/RoomItem/index.tsx
+++ b/app/presentation/RoomItem/index.tsx
@@ -1,5 +1,4 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 
 import I18n from '../../i18n';