diff --git a/src/features/bookmark-folders/components/new-folder-form.tsx b/src/features/bookmark-folders/components/new-folder-form.tsx
index a46527632..3244cbaea 100644
--- a/src/features/bookmark-folders/components/new-folder-form.tsx
+++ b/src/features/bookmark-folders/components/new-folder-form.tsx
@@ -23,10 +23,13 @@ const NewFolderForm: React.FC = () => {
     e.preventDefault();
     createBookmarkFolder({
       name: name.value,
-    }).then(() => {
-      toast.success(messages.createSuccess);
-    }).catch(() => {
-      toast.success(messages.createFail);
+    }, {
+      onSuccess() {
+        toast.success(messages.createSuccess);
+      },
+      onError() {
+        toast.success(messages.createFail);
+      },
     });
   };
 
diff --git a/src/features/bookmarks/index.tsx b/src/features/bookmarks/index.tsx
index b6ced5a4d..23a02bf5c 100644
--- a/src/features/bookmarks/index.tsx
+++ b/src/features/bookmarks/index.tsx
@@ -69,11 +69,14 @@ const Bookmarks: React.FC<IBookmarks> = ({ params }) => {
       message: intl.formatMessage(messages.deleteFolderMessage),
       confirm: intl.formatMessage(messages.deleteFolderConfirm),
       onConfirm: () => {
-        deleteBookmarkFolder(folderId!).then(() => {
-          toast.success(messages.deleteFolderSuccess);
-          history.push('/bookmarks');
-        }).catch(() => {
-          toast.error(messages.deleteFolderFail);
+        deleteBookmarkFolder(folderId!, {
+          onSuccess() {
+            toast.success(messages.deleteFolderSuccess);
+            history.push('/bookmarks');
+          },
+          onError() {
+            toast.error(messages.deleteFolderFail);
+          },
         });
       },
     }));
diff --git a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
index 700823d0a..0acb130d5 100644
--- a/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
+++ b/src/features/ui/components/modals/edit-bookmark-folder-modal.tsx
@@ -118,13 +118,15 @@ const EditBookmarkFolderModal: React.FC<IEditBookmarkFolderModal> = ({ folderId,
     updateBookmarkFolder({
       name: name.value,
       emoji,
-    }).then(() => {
-      toast.success(intl.formatMessage(messages.editSuccess));
-      dispatch(closeModal('EDIT_BOOKMARK_FOLDER'));
-    })
-      .catch(() => {
+    }, {
+      onSuccess() {
+        toast.success(intl.formatMessage(messages.editSuccess));
+        dispatch(closeModal('EDIT_BOOKMARK_FOLDER'));
+      },
+      onError() {
         toast.success(intl.formatMessage(messages.editFail));
-      });
+      },
+    });
   };
 
   const label = intl.formatMessage(messages.label);