diff --git a/calendar/src/main/java/com/riontech/calendar/fragment/CalendarFragment.java b/calendar/src/main/java/com/riontech/calendar/fragment/CalendarFragment.java
index 86fe984..929c54e 100644
--- a/calendar/src/main/java/com/riontech/calendar/fragment/CalendarFragment.java
+++ b/calendar/src/main/java/com/riontech/calendar/fragment/CalendarFragment.java
@@ -215,26 +215,32 @@ private void setData(CalendarResponse calendarResponse) {
         if (calendarResponse.getMonthdata() != null) {
 
             ArrayList<Event> monthDataList = calendarResponse.getMonthdata();
-            int m = 0;
+
+            boolean handled = false;
 
             for (int n = 0; n < mMonthLength; n++) {
                 String mItemValue = mDateFormat.format(mPMonthMaxSet.getTime());
                 mPMonthMaxSet.add(GregorianCalendar.DATE, 1);
 
-                if (m < monthDataList.size()) {
-                    if (mItemValue.equalsIgnoreCase(monthDataList.get(m).getDate())) {
+                /**
+                 * Check on event list if's the current date has events
+                 */
+                for (int i = 0; i < monthDataList.size(); i++) {
+                    if(mItemValue.equalsIgnoreCase(monthDataList.get(i).getDate())) {
                         CalendarDecoratorDao eventDao = new CalendarDecoratorDao(
-                                monthDataList.get(m).getDate(),
-                                Integer.parseInt(monthDataList.get(m).getCount()));
-                        mEventList.add(eventDao);
-                        m++;
-                    } else {
-                        CalendarDecoratorDao eventDao = new CalendarDecoratorDao(mItemValue, 0);
+                                monthDataList.get(i).getDate(),
+                                Integer.parseInt(monthDataList.get(i).getCount()));
                         mEventList.add(eventDao);
+                        handled = true;
+                        break;
                     }
-                } else {
+                }
+
+                if(!handled) {
                     CalendarDecoratorDao eventDao = new CalendarDecoratorDao(mItemValue, 0);
                     mEventList.add(eventDao);
+                } else {
+                    handled = false;
                 }
             }