diff --git a/feature/quickwidget/src/main/java/dev/arkbuilders/rate/feature/quickwidget/presentation/QuickPairsWidgetReceiver.kt b/feature/quickwidget/src/main/java/dev/arkbuilders/rate/feature/quickwidget/presentation/QuickPairsWidgetReceiver.kt
index 830e7c3fd..790b53579 100644
--- a/feature/quickwidget/src/main/java/dev/arkbuilders/rate/feature/quickwidget/presentation/QuickPairsWidgetReceiver.kt
+++ b/feature/quickwidget/src/main/java/dev/arkbuilders/rate/feature/quickwidget/presentation/QuickPairsWidgetReceiver.kt
@@ -46,7 +46,13 @@ class QuickPairsWidgetReceiver : GlanceAppWidgetReceiver() {
             GlanceAppWidgetManager(context)
                 .getGlanceIds(QuickPairsWidget::class.java)
                 .forEach { glanceId ->
-                    glanceAppWidget.update(context, glanceId)
+                    updateWidgetNewGroup(
+                        context = context,
+                        glanceId = glanceId,
+                        findNewIndex = { currentIndex, _ ->
+                            currentIndex ?: 0
+                        },
+                    )
                 }
         }
     }
@@ -70,8 +76,9 @@ class QuickPairsWidgetReceiver : GlanceAppWidgetReceiver() {
                     }
                 if (currentIndex == -1)
                     currentIndex = null
+
                 val newIndex = findNewIndex(currentIndex, allGroups.lastIndex)
-                val newGroup = allGroups[newIndex]
+                val newGroup = allGroups.getOrNull(newIndex)
                 if (newGroup != null) {
                     prefs[currentGroupIdKey] = newGroup.id
                 } else {