diff --git a/platform/configuration-store-impl/src/ComponentInfo.kt b/platform/configuration-store-impl/src/ComponentInfo.kt
index febdc3eb905d..b3fe7b7d649d 100644
--- a/platform/configuration-store-impl/src/ComponentInfo.kt
+++ b/platform/configuration-store-impl/src/ComponentInfo.kt
@@ -12,7 +12,7 @@ internal fun createComponentInfo(component: Any, stateSpec: State?): ComponentIn
     else -> ComponentInfoImpl(component, stateSpec)
   }
 
-  if (stateSpec != null && stateSpec.storages.all { it.roamingType === RoamingType.DISABLED }) {
+  if (stateSpec != null && !stateSpec.storages.isEmpty() && stateSpec.storages.all { it.roamingType === RoamingType.DISABLED }) {
     componentInfo.lastSaved = (System.currentTimeMillis() / 1000).toInt()
   }