diff --git a/addons/addon-kitty-graphics/src/KittyApcHandler.ts b/addons/addon-kitty-graphics/src/KittyApcHandler.ts
index c74e6725..a4acaed3 100644
--- a/addons/addon-kitty-graphics/src/KittyApcHandler.ts
+++ b/addons/addon-kitty-graphics/src/KittyApcHandler.ts
@@ -230,6 +230,7 @@ export class KittyApcHandler {
     const payload = cmd.payload ?? '';
     const pendingKey = cmd.id ?? 0;
 
+    // larger image would require chunking.
     const isMoreComing = cmd.more === 1;
     const pending = this._pendingTransmissions.get(pendingKey);
 
diff --git a/addons/addon-kitty-graphics/src/KittyGraphicsAddon.ts b/addons/addon-kitty-graphics/src/KittyGraphicsAddon.ts
index 21549986..1a4411b6 100644
--- a/addons/addon-kitty-graphics/src/KittyGraphicsAddon.ts
+++ b/addons/addon-kitty-graphics/src/KittyGraphicsAddon.ts
@@ -47,7 +47,7 @@ export class KittyGraphicsAddon implements ITerminalAddon, IKittyGraphicsApi {
     // Register APC handler for 'G' (0x47) - Kitty graphics protocol
     // APC sequence format: ESC _ G <data> ESC \
     this._apcHandler = terminal.parser.registerApcHandler(0x47, (data: string) => {
-      return this._kittyApcHandler!.handle(data);
+      return this._kittyApcHandler?.handle(data) ?? true;
     });
   }