diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
index 22544b96..589417e7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/adapters/TimerAdapter.kt
@@ -137,7 +137,7 @@ class TimerAdapter(
     }
 
     private fun resetTimer(timer: Timer) {
-        EventBus.getDefault().post(TimerEvent.Reset(timer.id!!, timer.seconds.secondsToMillis))
+        EventBus.getDefault().post(TimerEvent.Reset(timer.id!!))
         simpleActivity.hideTimerNotification(timer.id!!)
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
index a261061a..8dc24594 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/extensions/Context.kt
@@ -311,7 +311,7 @@ fun Context.getTimerNotification(timer: Timer, pendingIntent: PendingIntent, add
 
     val reminderActivityIntent = getReminderActivityIntent()
     val builder = NotificationCompat.Builder(this)
-        .setContentTitle(getString(R.string.timer))
+        .setContentTitle(if(timer.label.isEmpty()) getString(R.string.timer) else timer.label)
         .setContentText(getString(R.string.time_expired))
         .setSmallIcon(R.drawable.ic_timer)
         .setContentIntent(pendingIntent)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt b/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt
index cc8b64a5..b88a4148 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/models/TimerEvent.kt
@@ -2,7 +2,7 @@ package com.simplemobiletools.clock.models
 
 sealed class TimerEvent(open val timerId: Int) {
     data class Delete(override val timerId: Int) : TimerEvent(timerId)
-    data class Reset(override val timerId: Int, val duration: Long) : TimerEvent(timerId)
+    data class Reset(override val timerId: Int) : TimerEvent(timerId)
     data class Start(override val timerId: Int, val duration: Long) : TimerEvent(timerId)
     data class Pause(override val timerId: Int, val duration: Long) : TimerEvent(timerId)
     data class Finish(override val timerId: Int, val duration: Long) : TimerEvent(timerId)
diff --git a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt b/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt
index 116a27e0..e13fd0cd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/clock/receivers/HideTimerReceiver.kt
@@ -6,13 +6,13 @@ import android.content.Intent
 import com.simplemobiletools.clock.extensions.hideTimerNotification
 import com.simplemobiletools.clock.helpers.INVALID_TIMER_ID
 import com.simplemobiletools.clock.helpers.TIMER_ID
-import com.simplemobiletools.clock.models.TimerState
+import com.simplemobiletools.clock.models.TimerEvent
 import org.greenrobot.eventbus.EventBus
 
 class HideTimerReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         val timerId = intent.getIntExtra(TIMER_ID, INVALID_TIMER_ID)
         context.hideTimerNotification(timerId)
-        EventBus.getDefault().post(TimerState.Idle)
+        EventBus.getDefault().post(TimerEvent.Reset(timerId, ))
     }
 }