diff --git a/addon.xml b/addon.xml
index c45bd41..363ba4f 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="script.service.sponsorblock" version="0.2.4" name="SponsorBlock" provider-name="siku2">
+<addon id="script.service.sponsorblock" version="0.2.5" name="SponsorBlock" provider-name="siku2">
     <requires>
         <import addon="xbmc.python" version="2.26.0"/>
         <import addon="script.module.requests" version="2.15.1"/>
@@ -28,6 +28,10 @@ Users submit when a sponsor happens and the add-on automatically skips sponsors
         </description>
         <disclaimer lang="en_GB">This is an unoffical port of the SponsorBlock browser extension</disclaimer>
         <news>
+[0.2.5]
+- Sort received segments by start time (macearl, #18)
+- Skip all overlapping segments instead of just skipping the first one
+
 [0.2.4]
 - Handle all events which indicate that playback has ended
 - Handle local files gracefully
diff --git a/resources/lib/sponsorblock/api.py b/resources/lib/sponsorblock/api.py
index 3ff1a31..72f5f79 100644
--- a/resources/lib/sponsorblock/api.py
+++ b/resources/lib/sponsorblock/api.py
@@ -93,7 +93,8 @@ def get_skip_segments(
             seg = SponsorSegment(raw["UUID"], raw["category"], start, end)
             segments.append(seg)
 
-        return sorted(segments, key=lambda SponsorSegment: SponsorSegment.start)
+        segments.sort(key=lambda seg: seg.start)
+        return segments
 
     def vote_sponsor_segment(
         self, segment, upvote=False