diff --git a/packages/react/src/components/FormattingToolbar/DefaultButtons/TableCellMergeButton.tsx b/packages/react/src/components/FormattingToolbar/DefaultButtons/TableCellMergeButton.tsx
index 1008997cde..b6c51a8ca0 100644
--- a/packages/react/src/components/FormattingToolbar/DefaultButtons/TableCellMergeButton.tsx
+++ b/packages/react/src/components/FormattingToolbar/DefaultButtons/TableCellMergeButton.tsx
@@ -13,7 +13,7 @@ import { useEditorState } from "../../../hooks/useEditorState.js";
 import { useExtension } from "../../../hooks/useExtension.js";
 import { useDictionary } from "../../../i18n/dictionary.js";
 
-export const TableCellMergeButton = () => {
+const TableCellMergeButtonInner = () => {
   const dict = useDictionary();
   const Components = useComponentsContext()!;
 
@@ -77,3 +77,11 @@ export const TableCellMergeButton = () => {
     />
   );
 };
+
+export const TableCellMergeButton = () => {
+  const editor = useBlockNoteEditor();
+  if (!editor.getExtension(TableHandlesExtension)) {
+    return null;
+  }
+  return <TableCellMergeButtonInner />;
+};
diff --git a/packages/react/src/components/FormattingToolbar/DefaultButtons/TextAlignButton.tsx b/packages/react/src/components/FormattingToolbar/DefaultButtons/TextAlignButton.tsx
index 6dd3ee6f39..a21f1006cb 100644
--- a/packages/react/src/components/FormattingToolbar/DefaultButtons/TextAlignButton.tsx
+++ b/packages/react/src/components/FormattingToolbar/DefaultButtons/TextAlignButton.tsx
@@ -22,7 +22,6 @@ import {
 import { useComponentsContext } from "../../../editor/ComponentsContext.js";
 import { useBlockNoteEditor } from "../../../hooks/useBlockNoteEditor.js";
 import { useEditorState } from "../../../hooks/useEditorState.js";
-import { useExtension } from "../../../hooks/useExtension.js";
 import { useDictionary } from "../../../i18n/dictionary.js";
 
 type TextAlignment = DefaultProps["textAlignment"];
@@ -44,8 +43,6 @@ export const TextAlignButton = (props: { textAlignment: TextAlignment }) => {
     StyleSchema
   >();
 
-  const tableHandles = useExtension(TableHandlesExtension);
-
   const state = useEditorState({
     editor,
     selector: ({ editor }) => {
@@ -74,7 +71,10 @@ export const TextAlignButton = (props: { textAlignment: TextAlignment }) => {
         selectedBlocks.length === 1 &&
         blockHasType(firstBlock, editor, "table")
       ) {
-        const cellSelection = tableHandles.getCellSelection();
+        const cellSelection = editor
+          .getExtension(TableHandlesExtension)
+          ?.getCellSelection();
+
         if (!cellSelection) {
           return undefined;
         }
@@ -112,7 +112,9 @@ export const TextAlignButton = (props: { textAlignment: TextAlignment }) => {
             props: { textAlignment: textAlignment },
           });
         } else if (block.type === "table") {
-          const cellSelection = tableHandles.getCellSelection();
+          const cellSelection = editor
+            .getExtension(TableHandlesExtension)
+            ?.getCellSelection();
           if (!cellSelection) {
             continue;
           }
@@ -148,7 +150,7 @@ export const TextAlignButton = (props: { textAlignment: TextAlignment }) => {
         }
       }
     },
-    [editor, state, tableHandles],
+    [editor, state],
   );
 
   if (state === undefined) {