diff --git a/stream-chat-android-compose/build.gradle b/stream-chat-android-compose/build.gradle
index 6d03d2d5f59..b93ee944265 100644
--- a/stream-chat-android-compose/build.gradle
+++ b/stream-chat-android-compose/build.gradle
@@ -68,7 +68,7 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
 
 dependencies {
     api project(':stream-chat-android-ui-common')
-    compileOnly(project(":stream-chat-android-previewdata"))
+    implementation(project(":stream-chat-android-previewdata"))
     implementation project(":stream-chat-android-ui-utils")
 
     implementation Dependencies.androidxAppCompat
diff --git a/stream-chat-android-previewdata/api/stream-chat-android-previewdata.api b/stream-chat-android-previewdata/api/stream-chat-android-previewdata.api
index 705ff2e70a3..2c24adb22c2 100644
--- a/stream-chat-android-previewdata/api/stream-chat-android-previewdata.api
+++ b/stream-chat-android-previewdata/api/stream-chat-android-previewdata.api
@@ -1,5 +1,4 @@
 public final class io/getstream/chat/android/previewdata/PreviewChannelData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewChannelData;
 	public final fun getChannelWithFewMembers ()Lio/getstream/chat/android/models/Channel;
 	public final fun getChannelWithImage ()Lio/getstream/chat/android/models/Channel;
@@ -10,7 +9,6 @@ public final class io/getstream/chat/android/previewdata/PreviewChannelData {
 }
 
 public final class io/getstream/chat/android/previewdata/PreviewMembersData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewMembersData;
 	public final fun getManyMembers ()Ljava/util/List;
 	public final fun getMember1 ()Lio/getstream/chat/android/models/Member;
@@ -21,7 +19,6 @@ public final class io/getstream/chat/android/previewdata/PreviewMembersData {
 }
 
 public final class io/getstream/chat/android/previewdata/PreviewMessageData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewMessageData;
 	public final fun getMessage1 ()Lio/getstream/chat/android/models/Message;
 	public final fun getMessage2 ()Lio/getstream/chat/android/models/Message;
@@ -31,7 +28,6 @@ public final class io/getstream/chat/android/previewdata/PreviewMessageData {
 }
 
 public final class io/getstream/chat/android/previewdata/PreviewPollData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewPollData;
 	public final fun getOption1 ()Lio/getstream/chat/android/models/Option;
 	public final fun getOption2 ()Lio/getstream/chat/android/models/Option;
@@ -40,14 +36,12 @@ public final class io/getstream/chat/android/previewdata/PreviewPollData {
 }
 
 public final class io/getstream/chat/android/previewdata/PreviewReactionData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewReactionData;
 	public final fun getManyReaction ()Ljava/util/List;
 	public final fun getOneReaction ()Ljava/util/List;
 }
 
 public final class io/getstream/chat/android/previewdata/PreviewUserData {
-	public static final field $stable I
 	public static final field INSTANCE Lio/getstream/chat/android/previewdata/PreviewUserData;
 	public final fun getUser1 ()Lio/getstream/chat/android/models/User;
 	public final fun getUser2 ()Lio/getstream/chat/android/models/User;
diff --git a/stream-chat-android-previewdata/build.gradle.kts b/stream-chat-android-previewdata/build.gradle.kts
index a5dc5e634ed..6c55669110d 100644
--- a/stream-chat-android-previewdata/build.gradle.kts
+++ b/stream-chat-android-previewdata/build.gradle.kts
@@ -4,7 +4,6 @@ import io.getstream.chat.android.Dependencies
 plugins {
     id("com.android.library")
     id("org.jetbrains.kotlin.android")
-    id("org.jetbrains.kotlin.plugin.compose")
 }
 
 rootProject.extra.apply {
@@ -23,10 +22,6 @@ android {
     defaultConfig {
         consumerProguardFiles("consumer-rules.pro")
     }
-
-    buildFeatures {
-        compose = true
-    }
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
@@ -38,11 +33,7 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
 }
 
 dependencies {
-    implementation(project(":stream-chat-android-state"))
-    implementation(project(":stream-chat-android-client"))
-
-    // Compose
-    implementation(Dependencies.composeUi)
+    api(project(":stream-chat-android-client"))
 
     detektPlugins(Dependencies.detektFormatting)
 }