diff --git a/shared/data/src/commonMain/graphql/operations.graphql b/shared/data/src/commonMain/graphql/operations.graphql
index 323211bf..e5d5d834 100644
--- a/shared/data/src/commonMain/graphql/operations.graphql
+++ b/shared/data/src/commonMain/graphql/operations.graphql
@@ -27,7 +27,7 @@ fragment SessionDetails on Session {
         id
     }
     tags
-    #isServiceSession
+    type
 }
 
 
diff --git a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt
index d8f2574f..4d38ec71 100644
--- a/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt
+++ b/shared/data/src/commonMain/kotlin/fr/androidmakers/store/graphql/mappers.kt
@@ -56,7 +56,7 @@ fun SessionDetails.toSession(): Session {
       roomId = this.room?.id ?: "",
       endsAt = this.endsAt,
       startsAt = this.startsAt,
-      isServiceSession = false //isServiceSession
+      isServiceSession = this.type == "service"
   )
 }
 
diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt
index 59c6c807..cf53e3f9 100644
--- a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt
+++ b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/agenda/AgendaLayout.kt
@@ -132,7 +132,6 @@ private fun AgendaFilterDrawer(
             if (checked) add(SessionFilter(SessionFilter.FilterType.LANGUAGE, french))
           }
           onFiltersChanged(newSessionFilters)
-
         }
     )
     val english = "English"