diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
index 2a246e58ed..d13a69fba4 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt
@@ -93,7 +93,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) :
         val retrieved = appPreferences!!.getWaveFormFromFile(filename)
         if (retrieved.isNotEmpty() &&
             message.voiceMessageFloatArray == null ||
-            message.voiceMessageFloatArray!!.isEmpty()
+            message.voiceMessageFloatArray?.isEmpty() == true
         ) {
             message.voiceMessageFloatArray = retrieved.toFloatArray()
             binding.seekbar.setWaveData(message.voiceMessageFloatArray!!)
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
index cf9e0a9448..e0e9c296c6 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt
@@ -91,7 +91,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) :
         val retrieved = appPreferences!!.getWaveFormFromFile(filename)
         if (retrieved.isNotEmpty() &&
             message.voiceMessageFloatArray == null ||
-            message.voiceMessageFloatArray!!.isEmpty()
+            message.voiceMessageFloatArray?.isEmpty() == true
         ) {
             Log.d("Julius", "Retrieved and set ${retrieved.contentToString()}")
             message.voiceMessageFloatArray = retrieved.toFloatArray()