diff --git a/apps/tokenbar.js b/apps/tokenbar.js
index 642a5d5..4d74304 100644
--- a/apps/tokenbar.js
+++ b/apps/tokenbar.js
@@ -299,21 +299,51 @@ export class TokenBar extends Application {
                     }
                 });
 
+            // add actors without tokens that are owned by users, if setting is enabled
             if (setting("include-actor")) {
-                for (let user of game.users) {
-                    if ((user.active || setting("show-offline")) && !user.isGM && user.character && !this.entries.find(t => t.actor?.id === user.character?.id)) {
-                        this.entries.push({
-                            id: user.character.id,
-                            token: null,
-                            actor: user.character,
-                            img: null,
-                            thumb: null,
-                            stats: {},
-                            resource1: {},
-                            resource2: {},
-                            cssClass: "only-actor"
-                        });
-                    }
+                // iterate through all actors and if they belong to a player, add them to contention, pending other checks
+                for (let actor of game.actors) {
+                let t = actor.prototypeToken;
+
+                if (actor.hasPlayerOwner) {
+                    // exclude actors that are explicitly excluded
+                    let include = t.getFlag("monks-tokenbar", "include");
+                    if (include === "exclude") continue;
+
+                    // show offline users, if setting is enabled
+                    let showOnline =
+                    setting("show-offline") ||
+                    game.users.find(
+                        (u) => u.active && u.character?.id == t.actor?.id
+                    );
+
+                    if (!showOnline) continue;
+
+                    // exclude actors that don't pass the ownership/ permissions threshold
+                    let canView =
+                    game.user.isGM ||
+                    t.actor?.isOwner ||
+                    t.actor?.testUserPermission(
+                        game.user,
+                        setting("minimum-ownership") || "LIMITED"
+                    );
+
+                    if (!canView) continue;
+
+                    debug("Adding actor", actor.name);
+                    if (!this.entries.find((a) => a.actor?.id === actor.id))
+                    this.entries.push({
+                        id: actor.id,
+                        token: null,
+                        actor: actor,
+                        img: null,
+                        thumb: null,
+                        stats: {},
+                        resource1: {},
+                        resource2: {},
+                        cssClass: "only-actor",
+                    });
+                }
                 }
             }