diff --git a/player/player.go b/player/player.go
index cd29997..25bc2d1 100644
--- a/player/player.go
+++ b/player/player.go
@@ -228,10 +228,10 @@ loop:
 
 	// Calm down music
 loopcalm:
-	for i := 0; i < 128 && p.volume >= 500; i += 1 {
+	for i := 0; i < 64 && p.volume >= 15000; i += 1 {
 		timer := time.NewTimer(40 * time.Millisecond)
 
-		p.volume -= 768
+		p.volume -= 512
 		p.SetVolume(p.volume)
 
 		select {
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
index 8131e37..bfe47de 100644
--- a/ui/src/routes/+page.svelte
+++ b/ui/src/routes/+page.svelte
@@ -40,7 +40,6 @@
      reloadIsActiveAlarm().then((isActive) => {
          if (isActive) {
              setTimeout(reloadIsActiveAlarm, 10000);
-             setTimeout(reloadIsActiveAlarm, 25000);
          }
      })
  }
@@ -138,7 +137,7 @@
                 <button
                     class="btn btn-outline-warning"
                     title="Lancer le réveil"
-                    on:click={() => { runAlarm(); setTimeout(reloadIsActiveAlarm, 500); }}
+                    on:click={() => { runAlarm(); reloadIsActiveAlarm(); }}
                 >
                     <Icon name="play-circle" />
                     Lancer <span class="d-none d-lg-inline">le réveil</span>