diff --git a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
index 8791088b21b2d5ea1a6881ec6b7a4569c82aeb3b..999cbcaeb6752783d4570a3985c6a19c9c15e101 100644
--- a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
+++ b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AddNoteActivity.kt
@@ -264,15 +264,16 @@ class AddNoteActivity : AppCompatActivity(), DatePickerDialog.OnDateSetListener,
     }
 
     private fun startAlarm(c: Calendar) {
+        var id:Int = calendar.time.time.toInt()
+        if (oldNote != null) {
+            id = oldNote!!.createdAt.toInt()
+        }
         val alarmManager: AlarmManager = getSystemService(Context.ALARM_SERVICE) as AlarmManager
         val intent = Intent(this, AlertReceiver::class.java)
         intent.putExtra("title", title)
         intent.putExtra("content", content)
+        intent.putExtra("id", id)
         Toast.makeText(this, "title: $title, content:$content", Toast.LENGTH_SHORT).show()
-        var id:Int = calendar.time.time.toInt()
-        if (oldNote != null) {
-            id = oldNote!!.createdAt.toInt()
-        }
         val pendingIntent =
             PendingIntent.getBroadcast(this, id, intent, PendingIntent.FLAG_UPDATE_CURRENT)
 
diff --git a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
index 64c1e88bc43052a49b8bec1ad0aca8e5c76bce9d..c0fa2dfe4d0ed242f3045cbde45925ebfd400cc5 100644
--- a/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
+++ b/NoteApplication/app/src/main/java/com/noteapplication/cs398/AlertReceiver.kt
@@ -10,8 +10,9 @@ class AlertReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
         val title = intent.getSerializableExtra("title") as String
         val content = intent.getSerializableExtra("content") as String
+        val id = intent.getSerializableExtra("id") as Int
         val notificationHelper = NotificationHelper(context, title, content)
         val nb: NotificationCompat.Builder = notificationHelper.channelNotification
-        notificationHelper.manager!!.notify(1, nb.build())
+        notificationHelper.manager!!.notify(id, nb.build())
     }
 }
\ No newline at end of file