diff --git a/Charts/Classes/Data/ChartData.swift b/Charts/Classes/Data/ChartData.swift
index 9d8ac45636..c3310d17d8 100644
--- a/Charts/Classes/Data/ChartData.swift
+++ b/Charts/Classes/Data/ChartData.swift
@@ -687,6 +687,11 @@ public class ChartData: NSObject
         
         var entry = _dataSets[dataSetIndex].entryForXIndex(xIndex)
         
+        if (entry?.xIndex != xIndex)
+        {
+            return false
+        }
+        
         return removeEntry(entry, dataSetIndex: dataSetIndex)
     }