diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
index a93b3e7d..5ae49f78 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/events/model/Event.kt
@@ -177,11 +177,7 @@ data class Event(
      * @return The curve25519 key that sent this event.
      */
     fun getSenderKey(): String? {
-        return if (null != mClearEvent) {
-            mClearEvent!!.mSenderCurve25519Key
-        } else {
-            mSenderCurve25519Key
-        }
+        return mClearEvent?.mSenderCurve25519Key ?: mSenderCurve25519Key
     }
 
     /**