diff --git a/package.json b/package.json
index e5ab5a24..ba0f93ca 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
         "postinstall": "husky install"
     },
     "devDependencies": {
-        "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-1",
+        "@league-of-foundry-developers/foundry-vtt-types": "^0.8.8-5",
         "@rollup/plugin-node-resolve": "^13.0.0",
         "@types/fs-extra": "^9.0.12",
         "@types/jest": "^26.0.24",
@@ -71,7 +71,7 @@
         "jest-junit": "^12.2.0",
         "lint-staged": "^11.0.0",
         "prettier": "^2.3.2",
-        "rollup": "^2.52.8",
+        "rollup": "^2.53.1",
         "rollup-plugin-typescript2": "^0.30.0",
         "sass": "1.35.2",
         "semver": "^7.3.5",
diff --git a/src/module/macros/helpers.ts b/src/module/macros/helpers.ts
index eb9c85d5..1aa42890 100644
--- a/src/module/macros/helpers.ts
+++ b/src/module/macros/helpers.ts
@@ -13,7 +13,7 @@ import { getCanvas, getGame } from "../helpers";
 export function getActiveActor(): DS4Actor | undefined {
     const speaker = ChatMessage.getSpeaker();
 
-    const speakerToken = speaker.token ? getCanvas().tokens.get(speaker.token) : undefined;
+    const speakerToken = speaker.token ? getCanvas().tokens?.get(speaker.token) : undefined;
     if (speakerToken) {
         return speakerToken.actor ?? undefined;
     }
diff --git a/yarn.lock b/yarn.lock
index c371ecb2..179c75a5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -689,9 +689,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-1":
-  version: 0.8.8-1
-  resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-1"
+"@league-of-foundry-developers/foundry-vtt-types@npm:^0.8.8-5":
+  version: 0.8.8-5
+  resolution: "@league-of-foundry-developers/foundry-vtt-types@npm:0.8.8-5"
   dependencies:
     "@types/jquery": ~3.5.5
     "@types/simple-peer": ~9.11.0
@@ -701,7 +701,7 @@ __metadata:
     socket.io-client: 4.1.2
     tinymce: 5.8.1
     typescript: ^4.1.6
-  checksum: 40721e3f50f99606ab33b9db46c58eb2fdeb259c3e0c5fb5b856086bd11151406ffb8356bad51a516e2253dde507b7fc98c62ecd6002864c75a3f49e2baf2c83
+  checksum: e5f06d5bd68403cf79ed367bcfcc2eade250dc00800e1ede33357515ba9cd437336e0c1388c316501087ac5bce8b36731782e2509683d9186e1387283ed83e35
   languageName: node
   linkType: hard
 
@@ -2949,7 +2949,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dungeonslayers4@workspace:."
   dependencies:
-    "@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-1
+    "@league-of-foundry-developers/foundry-vtt-types": ^0.8.8-5
     "@rollup/plugin-node-resolve": ^13.0.0
     "@types/fs-extra": ^9.0.12
     "@types/jest": ^26.0.24
@@ -2968,7 +2968,7 @@ __metadata:
     jest-junit: ^12.2.0
     lint-staged: ^11.0.0
     prettier: ^2.3.2
-    rollup: ^2.52.8
+    rollup: ^2.53.1
     rollup-plugin-typescript2: ^0.30.0
     sass: 1.35.2
     semver: ^7.3.5
@@ -7228,9 +7228,9 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"rollup@npm:^2.52.8":
-  version: 2.52.8
-  resolution: "rollup@npm:2.52.8"
+"rollup@npm:^2.53.1":
+  version: 2.53.1
+  resolution: "rollup@npm:2.53.1"
   dependencies:
     fsevents: ~2.3.2
   dependenciesMeta:
@@ -7238,7 +7238,7 @@ fsevents@^1.2.7:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: bd83d5c89a23bf59b639fa57316e402402606a896a9fd25e16f83d5004b57a36fb21321f5726406741b68a5fcf4768adaa53a8f6cfb9e39c8d11a7e6be2fdd3a
+  checksum: 7c63a7251e87715795a4141371f4f7b31ce46c7dd8273a0f4b5240977eb7ecaddd1e8d0fdaf8eabfc7cf73075cc9d83e03c67b89e56f31a2e85cf1089e9fc34f
   languageName: node
   linkType: hard