diff --git a/cmd/server/assets/favicon.ico b/cmd/server/assets/favicon.ico
deleted file mode 100644
index 0356c6c89..000000000
Binary files a/cmd/server/assets/favicon.ico and /dev/null differ
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 80922e33d..c90255b20 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -199,6 +199,12 @@ func realMain(ctx context.Context) error {
 		static := filepath.Join(config.AssetsPath, "static")
 		fs := http.FileServer(http.Dir(static))
 		r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", fs))
+
+		// Browers and devices seem to always hit this - serve it to keep our logs
+		// cleaner.
+		r.Handle("/favicon.ico", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			http.ServeFile(w, r, filepath.Join(static, "favicon.ico"))
+		}))
 	}
 
 	{