diff --git a/code/controllers/subsystems/night_lighting.dm b/code/controllers/subsystems/night_lighting.dm
index ab6f999a182..0d82ba681ab 100644
--- a/code/controllers/subsystems/night_lighting.dm
+++ b/code/controllers/subsystems/night_lighting.dm
@@ -53,12 +53,12 @@ var/datum/controller/subsystem/nightlight/SSnightlight
 		if (!isactive)
 			activate()
 			if (announce)
-				command_announcement.Announce("Good evening. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now dim lighting in the public hallways in order to accommodate the circadian rhythm of some species.", "Automated Lighting System", new_sound = 'sound/misc/announcements/nightlight.ogg')
+				command_announcement.Announce("Good evening. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now dim lighting in the public hallways in order to accommodate the circadian rhythm of some species.", "Automated Lighting System", new_sound = 'sound/misc/announcements/notice.ogg')
 	else
 		if (isactive)
 			deactivate()
 			if (announce)
-				command_announcement.Announce("Good morning. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now return the public hallway lighting levels to normal.", "Automated Lighting System", new_sound = 'sound/misc/announcements/nightlight.ogg')
+				command_announcement.Announce("Good morning. The time is [worldtime2text()]. \n\nThe automated systems aboard the [station_name()] will now return the public hallway lighting levels to normal.", "Automated Lighting System", new_sound = 'sound/misc/announcements/notice.ogg')
 
 // 'whitelisted' areas are areas that have nightmode explicitly enabled
 
diff --git a/code/defines/procs/announce.dm b/code/defines/procs/announce.dm
index 2eb4cbb3488..81175a53783 100644
--- a/code/defines/procs/announce.dm
+++ b/code/defines/procs/announce.dm
@@ -116,5 +116,5 @@
 			rank = character.mind.role_alt_title
 		AnnounceArrivalSimple(character.real_name, rank, join_message)
 
-/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "has arrived on the station", var/new_sound = 'sound/misc/announcements/nightlight.ogg')
+/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "has arrived on the station", var/new_sound = 'sound/misc/announcements/notice.ogg')
 	global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer")
diff --git a/html/changelogs/mattatlas-announcementsound.yml b/html/changelogs/mattatlas-announcementsound.yml
new file mode 100644
index 00000000000..fc885cda793
--- /dev/null
+++ b/html/changelogs/mattatlas-announcementsound.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: MattAtlas
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - tweak: "The announcement sound has been changed to be the nightlight sound."
diff --git a/sound/misc/announcements/nightlight.ogg b/sound/misc/announcements/nightlight.ogg
deleted file mode 100644
index ad02a523542..00000000000
Binary files a/sound/misc/announcements/nightlight.ogg and /dev/null differ
diff --git a/sound/misc/announcements/notice.ogg b/sound/misc/announcements/notice.ogg
index 55acea94d5e..ad02a523542 100644
Binary files a/sound/misc/announcements/notice.ogg and b/sound/misc/announcements/notice.ogg differ