diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
index d36fc80d5c..a2cad6bb2f 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/SearchTask.kt
@@ -55,7 +55,7 @@ internal class DefaultSearchTask @Inject constructor(
                     searchCategories = SearchRequestCategories(
                             roomEvents = SearchRequestRoomEvents(
                                     searchTerm = params.searchTerm,
-                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT.value else SearchRequestOrder.RANK.value,
+                                    orderBy = if (params.orderByRecent) SearchRequestOrder.RECENT else SearchRequestOrder.RANK,
                                     filter = SearchRequestFilter(
                                             limit = params.limit,
                                             rooms = listOf(params.roomId)
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
index eac51ad2df..f0b6f7bc31 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestOrder.kt
@@ -17,13 +17,14 @@
 
 package org.matrix.android.sdk.internal.session.search.request
 
+import com.squareup.moshi.Json
 import com.squareup.moshi.JsonClass
 
 /**
  * Represents the order in which to search for results.
  */
 @JsonClass(generateAdapter = false)
-internal enum class SearchRequestOrder(val value: String) {
-    RANK("rank"),
-    RECENT("recent")
+internal enum class SearchRequestOrder {
+    @Json(name = "rank") RANK,
+    @Json(name = "recent") RECENT
 }
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
index 26b11e93bd..fef1baa990 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/search/request/SearchRequestRoomEvents.kt
@@ -29,7 +29,7 @@ internal data class SearchRequestRoomEvents(
         val filter: SearchRequestFilter? = null,
         // By default, this is "rank". One of: ["recent", "rank"]
         @Json(name = "order_by")
-        val orderBy: String? = null,
+        val orderBy: SearchRequestOrder? = null,
         // Configures whether any context for the events returned are included in the response.
         @Json(name = "event_context")
         val eventContext: SearchRequestEventContext? = null