diff --git a/api/v2/workspace_setting_service.go b/api/v2/workspace_setting_service.go
index e79bd64f..94dbd578 100644
--- a/api/v2/workspace_setting_service.go
+++ b/api/v2/workspace_setting_service.go
@@ -7,7 +7,7 @@ import (
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/encoding/protojson"
 
 	apiv2pb "github.com/usememos/memos/proto/gen/api/v2"
 	storepb "github.com/usememos/memos/proto/gen/store"
@@ -60,7 +60,7 @@ func (s *APIV2Service) GetWorkspaceGeneralSetting(ctx context.Context) (*storepb
 	}
 	workspaceGeneralSetting := &storepb.WorkspaceGeneralSetting{}
 	if workspaceSetting != nil {
-		if err := proto.Unmarshal([]byte(workspaceSetting.Value), workspaceGeneralSetting); err != nil {
+		if err := protojson.Unmarshal([]byte(workspaceSetting.Value), workspaceGeneralSetting); err != nil {
 			return nil, errors.Wrap(err, "failed to unmarshal workspace setting")
 		}
 	}
diff --git a/web/src/components/MemoContent/Spoiler.tsx b/web/src/components/MemoContent/Spoiler.tsx
index c0a5a368..44ca3b65 100644
--- a/web/src/components/MemoContent/Spoiler.tsx
+++ b/web/src/components/MemoContent/Spoiler.tsx
@@ -9,7 +9,7 @@ const Spoiler: React.FC<Props> = ({ content }: Props) => {
   const [isRevealed, setIsRevealed] = useState(false);
 
   return (
-    <div
+    <span
       className={classNames(
         "inline cursor-pointer select-none transition-all",
         isRevealed ? "bg-gray-100 dark:bg-zinc-700" : "bg-gray-200 dark:bg-zinc-600",
@@ -17,7 +17,7 @@ const Spoiler: React.FC<Props> = ({ content }: Props) => {
       onClick={() => setIsRevealed(!isRevealed)}
     >
       <span className={classNames(isRevealed ? "opacity-100" : "opacity-0")}>{content}</span>
-    </div>
+    </span>
   );
 };