diff --git a/prime-router/src/main/kotlin/fhirengine/utils/FHIRBundleHelpers.kt b/prime-router/src/main/kotlin/fhirengine/utils/FHIRBundleHelpers.kt
index 0ab1ac76400..d243a85e593 100644
--- a/prime-router/src/main/kotlin/fhirengine/utils/FHIRBundleHelpers.kt
+++ b/prime-router/src/main/kotlin/fhirengine/utils/FHIRBundleHelpers.kt
@@ -144,9 +144,9 @@ fun Bundle.isElr(): Boolean {
  * @return RSMessageType of this Bundle.
  */
 fun Bundle.getRSMessageType(): RSMessageType {
-    when {
-        isElr() -> return RSMessageType.LAB_RESULT
-        else -> return RSMessageType.UNKNOWN
+    return when {
+        isElr() -> RSMessageType.LAB_RESULT
+        else -> RSMessageType.UNKNOWN
     }
 }