diff --git a/src/wasm/activity-service/activity/util.go b/src/wasm/activity-service/activity/util.go
index 65570aa..b9ba224 100644
--- a/src/wasm/activity-service/activity/util.go
+++ b/src/wasm/activity-service/activity/util.go
@@ -65,13 +65,10 @@ func isBelong(timestamp, startTime, endTime time.Time) bool {
 		return true
 	}
 	if endTime.IsZero() { // Last Lap or Session has no EndTime
-		if timestamp.After(startTime) {
-			return true
-		}
-	} else {
-		if timestamp.After(startTime) || timestamp.Equal(endTime) {
-			return true
-		}
+		return timestamp.After(startTime)
+	}
+	if timestamp.Equal(endTime) {
+		return true
 	}
-	return false
+	return timestamp.After(startTime) && timestamp.Before(endTime)
 }