diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
index 9b1b908c..8368dfa8 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivityModule.kt
@@ -67,8 +67,7 @@ class ComposeActivityModule {
                 ?: activity.intent.extras?.getString("sms_body")
                 ?: activity.intent?.decodedDataString()
                         ?.substringAfter('?') // Query string
-                        ?.split(',')
-                        ?.firstOrNull { param -> param.startsWith("body") }
+                        ?.takeIf { it.startsWith("body") }
                         ?.substringAfter('=')
                 ?: "")
     }