diff --git a/public/app/plugins/panel/state-timeline/utils.ts b/public/app/plugins/panel/state-timeline/utils.ts
index 07b4d336c2d..dd71932f9f8 100644
--- a/public/app/plugins/panel/state-timeline/utils.ts
+++ b/public/app/plugins/panel/state-timeline/utils.ts
@@ -555,16 +555,18 @@ export function findNextStateIndex(field: Field, datapointIdx: number) {
     return null;
   }
 
+  const startValue = field.values.get(datapointIdx);
+
   while (end === undefined) {
     if (rightPointer >= field.values.length) {
       return null;
     }
     const rightValue = field.values.get(rightPointer);
 
-    if (rightValue !== undefined) {
-      end = rightPointer;
-    } else {
+    if (rightValue === undefined || rightValue === startValue) {
       rightPointer++;
+    } else {
+      end = rightPointer;
     }
   }