diff --git a/src/main/java/altk/comm/engine/Broadcast.java b/src/main/java/altk/comm/engine/Broadcast.java
index dcc9220..128406b 100644
--- a/src/main/java/altk/comm/engine/Broadcast.java
+++ b/src/main/java/altk/comm/engine/Broadcast.java
@@ -1117,12 +1117,12 @@ public abstract class Broadcast
 		int dailyStartMin = convert2Min(daily_start);
 		if (daily_stop == null || daily_stop.trim().length() == 0) return true;
 		int dailyStopMin = convert2Min(daily_stop);
-		// Ensure daily stop > daily start
-		if (dailyStopMin < dailyStartMin) dailyStopMin += 24 * 60;
+		if (dailyStartMin == dailyStopMin) return true; // non-stop
 		LocalTime now = LocalTime.now();
 		int nowMin = now.getHour() * 60 + now.getMinute();
-		if (nowMin < dailyStartMin) nowMin += 24 * 60;
-		boolean within = nowMin >= dailyStartMin && nowMin < dailyStopMin;
+		boolean within = (dailyStartMin < dailyStopMin)? 
+			nowMin >= dailyStartMin && nowMin < dailyStopMin :
+			nowMin >= dailyStartMin || nowMin < dailyStopMin; // wraps around midnight
 		return within;
 	}