diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm
index f8e05e9a38b6..d230e5ad679e 100644
--- a/code/datums/emotes.dm
+++ b/code/datums/emotes.dm
@@ -25,7 +25,7 @@
 	var/sound //Sound to play when emote is called
 	var/vary = FALSE	//used for the honk borg emote
 	var/only_forced_audio = FALSE //can only code call this event instead of the player.
-	var/cooldown = 0.8 SECONDS
+	var/cooldown = 2 SECONDS
 	var/static/regex/stop_bad_mime = regex(@"says|exclaims|yells|asks")
 
 /datum/emote/New()
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index ae867d518eb5..411936d067a6 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -346,6 +346,7 @@
 	key_third_person = "whistles"
 	message = "whistles!"
 	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
 
 /datum/emote/living/carbon/human/kepiwhistle/get_sound(mob/living/user)
 	if(!ishuman(user))
@@ -357,3 +358,17 @@
 	key = "woop"
 	key_third_person = "woops"
 	message = "woops!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/carbon/human/chitter
+	key = "chitter"
+	key_third_person = "chitters"
+	message = "chitters."
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+
+/datum/emote/living/carbon/human/chitter/get_sound(mob/living/user)
+	if(ismoth(user))
+		return 'sound/voice/moth/mothchitter.ogg'
+	if(iskepori(user))
+		return 'sound/voice/kepori/keporichitter.ogg' // provided by robustedsebster
diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
index 56ae0db795e5..c70927911ca1 100644
--- a/code/modules/mob/living/emote.dm
+++ b/code/modules/mob/living/emote.dm
@@ -60,18 +60,6 @@
 	message = "crosses their arms."
 	hands_use_check = TRUE
 
-/datum/emote/living/carbon/mothchitter
-	key = "chitter"
-	key_third_person = "chitters"
-	message = "chitters."
-	emote_type = EMOTE_AUDIBLE
-	vary = TRUE
-
-/datum/emote/living/carbon/mothchitter/get_sound(mob/living/user)
-	var/mob/living/carbon/human/H = user
-	if(ismoth(H) | (istype(H, /mob/living/simple_animal/pet/mothroach)))
-		return 'sound/voice/moth/mothchitter.ogg'
-
 /datum/emote/living/chuckle
 	key = "chuckle"
 	key_third_person = "chuckles"
diff --git a/sound/voice/kepori/keporichitter.ogg b/sound/voice/kepori/keporichitter.ogg
new file mode 100644
index 000000000000..9f69dfcffef9
Binary files /dev/null and b/sound/voice/kepori/keporichitter.ogg differ