diff --git a/app/containers/message/Components/Audio/index.tsx b/app/containers/message/Components/Audio/index.tsx
index d560f4c76..50ed3e586 100644
--- a/app/containers/message/Components/Audio/index.tsx
+++ b/app/containers/message/Components/Audio/index.tsx
@@ -15,7 +15,7 @@ import styles from './styles';
 import Slider from './Slider';
 import AudioRate from './AudioRate';
 import PlayButton from './PlayButton';
-import handleAudioMedia from '../../../../lib/methods/handleAudioMedia';
+import audioPlayer from '../../../../lib/methods/audioPlayer';
 
 interface IMessageAudioProps {
 	file: IAttachment;
@@ -43,16 +43,15 @@ const MessageAudio = ({ file, getCustomEmoji, author, isReply, style, msg }: IMe
 	const onPlaybackStatusUpdate = (status: AVPlaybackStatus) => {
 		if (status) {
 			onPlaying(status);
-			onLoad(status);
-			onProgress(status);
+			handlePlaybackStatusUpdate(status);
 			onEnd(status);
 		}
 	};
 
 	const loadAudio = async (audio: string) => {
-		await handleAudioMedia.loadAudio(audio);
+		await audioPlayer.loadAudio(audio);
 		audioUri.current = audio;
-		handleAudioMedia.setOnPlaybackStatusUpdate(audio, onPlaybackStatusUpdate);
+		audioPlayer.setOnPlaybackStatusUpdate(audio, onPlaybackStatusUpdate);
 	};
 
 	const onPlaying = (data: AVPlaybackStatus) => {
@@ -63,20 +62,15 @@ const MessageAudio = ({ file, getCustomEmoji, author, isReply, style, msg }: IMe
 		}
 	};
 
-	const onLoad = (data: AVPlaybackStatus) => {
+	const handlePlaybackStatusUpdate = (data: AVPlaybackStatus) => {
 		if (data.isLoaded && data.durationMillis) {
 			const durationSeconds = data.durationMillis / 1000;
 			duration.value = durationSeconds > 0 ? durationSeconds : 0;
-			setRate(data.rate);
-		}
-	};
-
-	const onProgress = (data: AVPlaybackStatus) => {
-		if (data.isLoaded) {
 			const currentSecond = data.positionMillis / 1000;
-			if (currentSecond <= duration.value) {
+			if (currentSecond <= durationSeconds) {
 				currentTime.value = currentSecond;
 			}
+			setRate(data.rate);
 		}
 	};
 
@@ -94,7 +88,7 @@ const MessageAudio = ({ file, getCustomEmoji, author, isReply, style, msg }: IMe
 	};
 
 	const setPosition = async (time: number) => {
-		await handleAudioMedia.setPositionAsync(audioUri.current, time);
+		await audioPlayer.setPositionAsync(audioUri.current, time);
 	};
 
 	const getUrl = () => {
@@ -108,9 +102,9 @@ const MessageAudio = ({ file, getCustomEmoji, author, isReply, style, msg }: IMe
 	const togglePlayPause = async () => {
 		try {
 			if (!paused) {
-				await handleAudioMedia.pauseAudio(audioUri.current);
+				await audioPlayer.pauseAudio(audioUri.current);
 			} else {
-				await handleAudioMedia.playAudio(audioUri.current);
+				await audioPlayer.playAudio(audioUri.current);
 			}
 		} catch {
 			// Do nothing
@@ -118,7 +112,7 @@ const MessageAudio = ({ file, getCustomEmoji, author, isReply, style, msg }: IMe
 	};
 
 	const onChangeRate = async (value = 1.0) => {
-		await handleAudioMedia.setRateAsync(audioUri.current, value);
+		await audioPlayer.setRateAsync(audioUri.current, value);
 	};
 
 	const handleDownload = async () => {
diff --git a/app/lib/methods/handleAudioMedia.ts b/app/lib/methods/audioPlayer.ts
similarity index 89%
rename from app/lib/methods/handleAudioMedia.ts
rename to app/lib/methods/audioPlayer.ts
index f1180f771..a46eb84fa 100644
--- a/app/lib/methods/handleAudioMedia.ts
+++ b/app/lib/methods/audioPlayer.ts
@@ -11,7 +11,7 @@ const mode = {
 	interruptionModeAndroid: InterruptionModeAndroid.DoNotMix
 };
 
-class HandleAudioMedia {
+class AudioPlayer {
 	private audioQueue: { [uri: string]: Sound };
 	private audioPlaying: string;
 
@@ -67,6 +67,12 @@ class HandleAudioMedia {
 		this.audioPlaying = '';
 	}
 
+	async pauseCurrentAudio() {
+		if (this.audioPlaying) {
+			await this.pauseAudio(this.audioPlaying);
+		}
+	}
+
 	async setPositionAsync(uri: string, time: number) {
 		try {
 			await this.audioQueue[uri]?.setPositionAsync(time);
@@ -86,6 +92,12 @@ class HandleAudioMedia {
 		this.audioPlaying = '';
 	}
 
+	async unloadCurrentAudio() {
+		if (this.audioPlaying) {
+			await this.unloadAudio(this.audioPlaying);
+		}
+	}
+
 	async unloadAllAudios() {
 		const audiosLoaded = Object.values(this.audioQueue);
 		try {
@@ -103,5 +115,5 @@ class HandleAudioMedia {
 	}
 }
 
-const handleAudioMedia = new HandleAudioMedia();
-export default handleAudioMedia;
+const audioPlayer = new AudioPlayer();
+export default audioPlayer;
diff --git a/app/lib/methods/index.ts b/app/lib/methods/index.ts
index 9ae29c5c5..e5962d045 100644
--- a/app/lib/methods/index.ts
+++ b/app/lib/methods/index.ts
@@ -37,5 +37,5 @@ export * from './crashReport';
 export * from './parseSettings';
 export * from './subscribeRooms';
 export * from './serializeAsciiUrl';
-export * from './handleAudioMedia';
+export * from './audioPlayer';
 export * from './isRoomFederated';