diff --git a/feature/src/main/java/com/terning/feature/calendar/CalendarRoute.kt b/feature/src/main/java/com/terning/feature/calendar/CalendarRoute.kt
index 03afb65e3..827f8d416 100644
--- a/feature/src/main/java/com/terning/feature/calendar/CalendarRoute.kt
+++ b/feature/src/main/java/com/terning/feature/calendar/CalendarRoute.kt
@@ -29,6 +29,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.terning.core.designsystem.theme.Grey200
 import com.terning.feature.R
 import com.terning.feature.calendar.component.CalendarTopBar
@@ -48,7 +49,7 @@ fun CalendarScreen(
     modifier: Modifier = Modifier,
     viewModel: CalendarViewModel = hiltViewModel()
 ) {
-    val selectedDate by viewModel.selectedDate.collectAsState()
+    val selectedDate by viewModel.selectedDate.collectAsStateWithLifecycle()
     val state by remember { mutableStateOf(CalendarState()) }
 
     val listState = rememberLazyListState(
diff --git a/feature/src/main/java/com/terning/feature/calendar/CalendarWeekWithScrap.kt b/feature/src/main/java/com/terning/feature/calendar/CalendarWeekWithScrap.kt
index 00a1adde4..fbdf774cc 100644
--- a/feature/src/main/java/com/terning/feature/calendar/CalendarWeekWithScrap.kt
+++ b/feature/src/main/java/com/terning/feature/calendar/CalendarWeekWithScrap.kt
@@ -29,7 +29,10 @@ fun CalendarWeekWithScrap(
     ) {
         Card(
             modifier = Modifier
-                .border(0.dp, Grey200, RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp))
+                .border(
+                    width = 0.dp,
+                    color = Grey200,
+                    shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp))
                 .shadow(
                     shape = RoundedCornerShape(bottomStart = 20.dp, bottomEnd = 20.dp),
                     elevation = 1.dp
@@ -49,7 +52,7 @@ fun CalendarWeekWithScrap(
         LazyColumn(
             modifier = Modifier
                 .fillMaxWidth()
-        ){
+        ) {
             /*items(items = scrapLists[selectedDate?.dayOfMonth - 1]) {
 
             }*/