diff --git a/app/containers/message/Audio.js b/app/containers/message/Audio.js
index d439ba2a7..5f344ba24 100644
--- a/app/containers/message/Audio.js
+++ b/app/containers/message/Audio.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import { View, StyleSheet, TouchableOpacity, Text } from 'react-native';
+import { View, StyleSheet, TouchableOpacity, Text, Easing } from 'react-native';
 import { connect } from 'react-redux';
 import Video from 'react-native-video';
 import Icon from 'react-native-vector-icons/MaterialIcons';
@@ -151,6 +151,11 @@ export default class Audio extends React.PureComponent {
 						maximumValue={this.state.duration}
 						minimumValue={0}
 						animateTransitions
+						animationConfig={{
+							duration: 250,
+							easing: Easing.linear,
+							delay: 0
+						}}
 						thumbTintColor='#ccc'
 						onValueChange={value => this.setState({ currentTime: value })}
 					/>
diff --git a/app/containers/message/index.js b/app/containers/message/index.js
index d2d01176c..00ecaa2d2 100644
--- a/app/containers/message/index.js
+++ b/app/containers/message/index.js
@@ -85,6 +85,9 @@ export default class Message extends React.Component {
 		}
 
 		const msg = emojify(this.props.item.msg, { output: 'unicode' });
+		if (!msg) {
+			return null;
+		}
 		return (
 			<Markdown>
 				{msg}