diff --git a/feature-detail/src/main/java/com/kimym/marvel/feature/detail/DetailViewModel.kt b/feature-detail/src/main/java/com/kimym/marvel/feature/detail/DetailViewModel.kt
index 9357ded..424f7db 100644
--- a/feature-detail/src/main/java/com/kimym/marvel/feature/detail/DetailViewModel.kt
+++ b/feature-detail/src/main/java/com/kimym/marvel/feature/detail/DetailViewModel.kt
@@ -20,10 +20,10 @@ class DetailViewModel @Inject constructor(
     private val id: Int = savedStateHandle["id"] ?: 0
 
     val movie = movieRepository.getMovie(id)
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), null)
 
     val rating = ratingRepository.getRating(id)
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), 0f)
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), 0f)
 
     fun insertRating(rating: Float) {
         viewModelScope.launch {
diff --git a/feature-favorite/src/main/java/com/kimym/marvel/feature/favorite/FavoriteViewModel.kt b/feature-favorite/src/main/java/com/kimym/marvel/feature/favorite/FavoriteViewModel.kt
index 19d0867..5ae90da 100644
--- a/feature-favorite/src/main/java/com/kimym/marvel/feature/favorite/FavoriteViewModel.kt
+++ b/feature-favorite/src/main/java/com/kimym/marvel/feature/favorite/FavoriteViewModel.kt
@@ -13,5 +13,5 @@ class FavoriteViewModel @Inject constructor(
     repository: MovieRepository
 ) : ViewModel() {
     val favorites = repository.getMovieAndRatings()
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), emptyList())
 }
diff --git a/feature-movie/src/main/java/com/kimym/marvel/feature/movie/MovieViewModel.kt b/feature-movie/src/main/java/com/kimym/marvel/feature/movie/MovieViewModel.kt
index df0fb1e..9bb3186 100644
--- a/feature-movie/src/main/java/com/kimym/marvel/feature/movie/MovieViewModel.kt
+++ b/feature-movie/src/main/java/com/kimym/marvel/feature/movie/MovieViewModel.kt
@@ -13,5 +13,5 @@ class MovieViewModel @Inject constructor(
     repository: MovieRepository
 ) : ViewModel() {
     val movies = repository.getMovies()
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), emptyList())
 }
diff --git a/feature-rating/src/main/java/com/kimym/marvel/feature/rating/RatingViewModel.kt b/feature-rating/src/main/java/com/kimym/marvel/feature/rating/RatingViewModel.kt
index ca96694..a1966ab 100644
--- a/feature-rating/src/main/java/com/kimym/marvel/feature/rating/RatingViewModel.kt
+++ b/feature-rating/src/main/java/com/kimym/marvel/feature/rating/RatingViewModel.kt
@@ -17,5 +17,5 @@ class RatingViewModel @Inject constructor(
     private val id: Int = savedStateHandle["id"] ?: 0
 
     val title = movieRepository.getMovieTitle(id)
-        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), "")
+        .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000L), "")
 }