diff --git a/controllers/emoji.go b/controllers/emoji.go
index f66e3cc9a..745ae66c5 100644
--- a/controllers/emoji.go
+++ b/controllers/emoji.go
@@ -8,11 +8,13 @@ import (
 
 	"github.com/owncast/owncast/config"
 	"github.com/owncast/owncast/core/data"
+	"github.com/owncast/owncast/router/middleware"
 )
 
 // GetCustomEmojiList returns a list of emoji via the API.
 func GetCustomEmojiList(w http.ResponseWriter, r *http.Request) {
 	emojiList := data.GetEmojiList()
+	middleware.SetCachingHeaders(w, r)
 
 	if err := json.NewEncoder(w).Encode(emojiList); err != nil {
 		InternalErrorHandler(w, err)
@@ -25,5 +27,6 @@ func GetCustomEmojiImage(w http.ResponseWriter, r *http.Request) {
 	r.URL.Path = path
 
 	emojiFS := os.DirFS(config.CustomEmojiPath)
+	middleware.SetCachingHeaders(w, r)
 	http.FileServer(http.FS(emojiFS)).ServeHTTP(w, r)
 }