diff --git a/src/app/core/config/migrate-add-entity-attributes.ts b/src/app/core/config/migrate-add-entity-attributes.ts
index 9b75d89841..a7db1b502c 100644
--- a/src/app/core/config/migrate-add-entity-attributes.ts
+++ b/src/app/core/config/migrate-add-entity-attributes.ts
@@ -4,7 +4,10 @@ import { EntityConfig } from "../entity/entity-config";
 export function migrateAddMissingEntityAttributes(config: Config): Config {
   for (let entityType of Object.keys(DEFAULT_ENTITIES)) {
     // TODO: just blindly save all hard-coded fields into the entity config? or scan which ones are actually used?!
-    if (!JSON.stringify(config).includes(`"${entityType}"`)) {
+    if (
+      !JSON.stringify(config).includes(`"${entityType}"`) ||
+      ["Note", "User"].includes(entityType)
+    ) {
       // don't add config if the entity is never explicitly used or referenced
       continue;
     }