diff --git a/apps/calclock/ChangeLog b/apps/calclock/ChangeLog
index b157136a5..ee9daa17e 100644
--- a/apps/calclock/ChangeLog
+++ b/apps/calclock/ChangeLog
@@ -5,3 +5,4 @@
 0.05: Show calendar colors & improved all day events.
 0.06: Improved multi-line locations & titles
 0.07: Buzz 30, 15 and 1 minute before an event
+0.08: No buzz during quiet hours & tweaked 30-minute buzz
diff --git a/apps/calclock/calclock.js b/apps/calclock/calclock.js
index 622b77612..5266bf2f4 100644
--- a/apps/calclock/calclock.js
+++ b/apps/calclock/calclock.js
@@ -119,10 +119,12 @@ function fullRedraw() {
 
 function buzzForEvents() {
   let nextEvent = next[0]; if (!nextEvent) return;
-  if (nextEvent.allDay) return;
+  // No buzz for all day events or events before 7am
+  // TODO: make this configurable
+  if (nextEvent.allDay || (new Date(nextEvent.timestamp * 1000)).getHours() < 7) return;
   let minToEvent = Math.round((nextEvent.timestamp - getTime()) / 60.0);
   switch (minToEvent) {
-    case 30: require("buzz").pattern(","); break;
+    case 30: require("buzz").pattern(":"); break;
     case 15: require("buzz").pattern(", ,"); break;
     case 1: require("buzz").pattern(": : :"); break;
   }
diff --git a/apps/calclock/metadata.json b/apps/calclock/metadata.json
index 5cb47956b..4334a4476 100644
--- a/apps/calclock/metadata.json
+++ b/apps/calclock/metadata.json
@@ -2,7 +2,7 @@
   "id": "calclock",
   "name": "Calendar Clock",
   "shortName": "CalClock",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Show the current and upcoming events synchronized from Gadgetbridge",
   "icon": "calclock.png",
   "type": "clock",