diff --git a/android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeListInundationUseCase.kt b/android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeCacheUseCase.kt
similarity index 92%
rename from android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeListInundationUseCase.kt
rename to android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeCacheUseCase.kt
index fee0da3a74..b980611d58 100644
--- a/android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeListInundationUseCase.kt
+++ b/android/app/src/main/java/com/naviapp/screenOverlay/usecase/NudgeCacheUseCase.kt
@@ -10,6 +10,7 @@ package com.naviapp.screenOverlay.usecase
 import com.google.gson.Gson
 import com.navi.base.cache.model.NaviCacheEntity
 import com.navi.base.cache.repository.NaviCacheRepositoryImpl
+import com.navi.base.utils.isNotNull
 import com.navi.common.utils.log
 import com.navi.uitron.model.UiTronResponse
 import com.naviapp.network.di.DataDeserializers
@@ -41,7 +42,7 @@ constructor(
                 when (nudge.status) {
                     NudgeStatus.DEFAULT ->
                         nudgeConfig.defaultState?.let {
-                            cachedNudges[nudgeId] = NudgeCache(it)
+                            cachedNudges[nudgeId] = NudgeCache(defaultStateData = it)
                             nudge.copy(
                                 data = nudgeConfig.copy(inProgressState = null, successState = null)
                             )
@@ -102,7 +103,10 @@ constructor(
                 repository.save(
                     NaviCacheEntity(
                         key = HOME_NUDGE_KEY,
-                        value = serializer.toJson(this),
+                        value =
+                            serializer.toJson(
+                                this.filterValues { it.defaultStateData.isNotNull() }
+                            ),
                         version = 1,
                         ttl = -1L,
                         clearOnLogout = true,