diff --git a/app/layout.tsx b/app/layout.tsx
index 125cd8fa3..9e25ae896 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -53,7 +53,7 @@ export const viewport: Viewport = {
 
 export default function RootLayout({ children }: { children: React.ReactNode }) {
   return (
-    <html lang="en">
+    <html lang="en" suppressHydrationWarning>
       <head>
         <ThemeScript />
         <DynamicFontLoader />
diff --git a/components/editor/action-bar/components/undo-redo-buttons.tsx b/components/editor/action-bar/components/undo-redo-buttons.tsx
index 69d3e58f7..2c45e74bd 100644
--- a/components/editor/action-bar/components/undo-redo-buttons.tsx
+++ b/components/editor/action-bar/components/undo-redo-buttons.tsx
@@ -2,11 +2,17 @@ import { TooltipWrapper } from "@/components/tooltip-wrapper";
 import { Button } from "@/components/ui/button";
 import { useEditorStore } from "@/store/editor-store";
 import { Redo, Undo } from "lucide-react";
+import * as React from "react";
 
-interface UndoRedoButtonsProps extends React.ComponentProps<typeof Button> {}
+interface UndoRedoButtonsProps extends React.ComponentProps<typeof Button> { }
 
 export function UndoRedoButtons({ disabled, ...props }: UndoRedoButtonsProps) {
   const { undo, redo, canUndo, canRedo } = useEditorStore();
+  const [mounted, setMounted] = React.useState(false);
+
+  React.useEffect(() => {
+    setMounted(true);
+  }, []);
 
   return (
     <div className="flex items-center gap-1">
@@ -14,7 +20,7 @@ export function UndoRedoButtons({ disabled, ...props }: UndoRedoButtonsProps) {
         <Button
           variant="ghost"
           size="icon"
-          disabled={disabled || !canUndo()}
+          disabled={!mounted || disabled || !canUndo()}
           {...props}
           onClick={undo}
         >
@@ -26,7 +32,7 @@ export function UndoRedoButtons({ disabled, ...props }: UndoRedoButtonsProps) {
         <Button
           variant="ghost"
           size="icon"
-          disabled={disabled || !canRedo()}
+          disabled={!mounted || disabled || !canRedo()}
           {...props}
           onClick={redo}
         >
