diff --git a/package/src/renderer/Canvas.tsx b/package/src/renderer/Canvas.tsx
index 306f4731e0..165adeb594 100644
--- a/package/src/renderer/Canvas.tsx
+++ b/package/src/renderer/Canvas.tsx
@@ -40,10 +40,10 @@ export const Canvas = forwardRef<SkiaDomView, CanvasProps>(
 
     const registerValues = useCallback(
       (values: Array<SkiaValue<unknown>>) => {
-        if (ref.current === null) {
-          throw new Error("Canvas ref is not set");
+        if (ref.current !== null) {
+          return ref.current.registerValues(values);
         }
-        return ref.current.registerValues(values);
+        return () => {};
       },
       [ref]
     );
diff --git a/package/src/renderer/HostConfig.ts b/package/src/renderer/HostConfig.ts
index fc66964939..899f22db60 100644
--- a/package/src/renderer/HostConfig.ts
+++ b/package/src/renderer/HostConfig.ts
@@ -155,6 +155,7 @@ export const skHostConfig: SkiaHostConfig = {
 
   resetAfterCommit(container) {
     debug("resetAfterCommit");
+    container.depMgr.update();
     container.redraw();
   },
 
diff --git a/package/src/renderer/Reconciler.tsx b/package/src/renderer/Reconciler.tsx
index d2c9b1cfe7..54bbf187ee 100644
--- a/package/src/renderer/Reconciler.tsx
+++ b/package/src/renderer/Reconciler.tsx
@@ -50,7 +50,6 @@ export class SkiaRoot {
   render(element: ReactNode) {
     skiaReconciler.updateContainer(element, this.root, null, () => {
       hostDebug("updateContainer");
-      this.container.depMgr.update();
     });
   }