diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed08701fd..abc9ccedc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
 
+### Added
+
+- Added `assets` to the list of the reserved nicknames and static file constants
+
 ## Unreleased (Patch)
 
 ## [2.3.0] - 2020-03-01
diff --git a/config/config.exs b/config/config.exs
index 66aee3264..0500c8c86 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -503,6 +503,7 @@ config :pleroma, Pleroma.User,
     "about",
     "activities",
     "api",
+    "assets",
     "auth",
     "check_password",
     "dev",
diff --git a/lib/pleroma/constants.ex b/lib/pleroma/constants.ex
index b24338cc6..f2059a0f3 100644
--- a/lib/pleroma/constants.ex
+++ b/lib/pleroma/constants.ex
@@ -25,7 +25,7 @@ defmodule Pleroma.Constants do
 
   const(static_only_files,
     do:
-      ~w(index.html robots.txt static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
+      ~w(index.html robots.txt assets static static-fe finmoji emoji packs sounds images instance sw.js sw-pleroma.js favicon.png schemas doc embed.js embed.css)
   )
 
   def as_local_public, do: Pleroma.Web.base_url() <> "/#Public"