diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
index 0f2a89a5..0375fbcc 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecoration.java
@@ -118,12 +118,7 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
 
                         c.drawLine(startPx, view.getTop() - margin, startPx, bottomPx, paint);
                     }
-                    int color;
-                    if (indentation - 1 >= colorList.size()) {
-                        color = colorList.get(indentation - 1 - colorList.size());
-                    } else {
-                        color = colorList.get(indentation - 1);
-                    }
+                    int color = colorList.get(indentation%colorList.size()-1);
                     paint.setColor(ResourcesCompat.getColor(_mContext.getResources(), color, _mContext.getTheme()));
 
                     float startDp = 6 * fontScale * (indentation - 1) + 6 * fontScale;
diff --git a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecorationSimple.java b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecorationSimple.java
index aacacc2d..0337fd16 100644
--- a/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecorationSimple.java
+++ b/app/src/main/java/app/fedilab/android/mastodon/helper/DividerDecorationSimple.java
@@ -127,12 +127,7 @@ public class DividerDecorationSimple extends RecyclerView.ItemDecoration {
 
                         c.drawLine(startPx, view.getTop() - margin, startPx, bottomPx, paint);
                     }
-                    int color;
-                    if (indentation - 1 >= colorList.size()) {
-                        color = colorList.get(indentation - 1 - colorList.size());
-                    } else {
-                        color = colorList.get(indentation - 1);
-                    }
+                    int color = colorList.get(indentation%colorList.size()-1);
                     paint.setColor(ResourcesCompat.getColor(_mContext.getResources(), color, _mContext.getTheme()));
 
                     float startDp = 6 * fontScale * (indentation - 1) + 6 * fontScale;