diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
index 5844aead8d..a5d0f63722 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/Membership.kt
@@ -23,24 +23,13 @@ import com.squareup.moshi.JsonClass
  * Represents the membership of a user on a room
  */
 @JsonClass(generateAdapter = false)
-enum class Membership(val value: String) {
-
-    NONE("none"),
-
-    @Json(name = "invite")
-    INVITE("invite"),
-
-    @Json(name = "join")
-    JOIN("join"),
-
-    @Json(name = "knock")
-    KNOCK("knock"),
-
-    @Json(name = "leave")
-    LEAVE("leave"),
-
-    @Json(name = "ban")
-    BAN("ban");
+enum class Membership {
+    NONE,
+    @Json(name = "invite") INVITE,
+    @Json(name = "join") JOIN,
+    @Json(name = "knock") KNOCK,
+    @Json(name = "leave") LEAVE,
+    @Json(name = "ban") BAN;
 
     fun isLeft(): Boolean {
         return this == KNOCK || this == LEAVE || this == BAN
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
index 24a56b6b56..0760c6f1b4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomGuestAccessContent.kt
@@ -40,10 +40,7 @@ data class RoomGuestAccessContent(
 }
 
 @JsonClass(generateAdapter = false)
-enum class GuestAccess(val value: String) {
-    @Json(name = "can_join")
-    CanJoin("can_join"),
-
-    @Json(name = "forbidden")
-    Forbidden("forbidden")
+enum class GuestAccess {
+    @Json(name = "can_join") CanJoin,
+    @Json(name = "forbidden") Forbidden
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
index 09aacfabbe..f3e8d357f3 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/RoomJoinRules.kt
@@ -24,17 +24,9 @@ import com.squareup.moshi.JsonClass
  * Enum for [RoomJoinRulesContent] : https://matrix.org/docs/spec/client_server/r0.4.0#m-room-join-rules
  */
 @JsonClass(generateAdapter = false)
-enum class RoomJoinRules(val value: String) {
-
-    @Json(name = "public")
-    PUBLIC("public"),
-
-    @Json(name = "invite")
-    INVITE("invite"),
-
-    @Json(name = "knock")
-    KNOCK("knock"),
-
-    @Json(name = "private")
-    PRIVATE("private")
+enum class RoomJoinRules {
+    @Json(name = "public") PUBLIC,
+    @Json(name = "invite") INVITE,
+    @Json(name = "knock") KNOCK,
+    @Json(name = "private") PRIVATE
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
index 20cb49ee8a..b065a30fc9 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/RoomAPI.kt
@@ -18,6 +18,7 @@ package org.matrix.android.sdk.internal.session.room
 
 import org.matrix.android.sdk.api.session.events.model.Content
 import org.matrix.android.sdk.api.session.events.model.Event
+import org.matrix.android.sdk.api.session.room.model.Membership
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsParams
 import org.matrix.android.sdk.api.session.room.model.roomdirectory.PublicRoomsResponse
 import org.matrix.android.sdk.api.util.JsonDict
@@ -100,8 +101,8 @@ internal interface RoomAPI {
     @GET(NetworkConstants.URI_API_PREFIX_PATH_R0 + "rooms/{roomId}/members")
     fun getMembers(@Path("roomId") roomId: String,
                    @Query("at") syncToken: String?,
-                   @Query("membership") membership: String?,
-                   @Query("not_membership") notMembership: String?
+                   @Query("membership") membership: Membership?,
+                   @Query("not_membership") notMembership: Membership?
     ): Call<RoomMembersResponse>
 
     /**
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
index cc491d1cd9..6adf3c59d1 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/membership/LoadRoomMembersTask.kt
@@ -91,7 +91,7 @@ internal class DefaultLoadRoomMembersTask @Inject constructor(
         val lastToken = syncTokenStore.getLastToken()
         val response = try {
             executeRequest<RoomMembersResponse>(globalErrorReceiver) {
-                apiCall = roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership?.value)
+                apiCall = roomAPI.getMembers(params.roomId, lastToken, null, params.excludeMembership)
             }
         } catch (throwable: Throwable) {
             // Revert status to NONE