diff --git a/src/server/json_family.cc b/src/server/json_family.cc
index bee4e64a5..e20d1e0ad 100644
--- a/src/server/json_family.cc
+++ b/src/server/json_family.cc
@@ -748,47 +748,19 @@ OpResult<JsonCallbackResult<T>> JsonReadOnlyOperation(const OpArgs& op_args, std
   return json_path.ExecuteReadOnlyCallback<T>(json_val, cb, options.cb_result_options);
 }
 
-struct MutateOperationOptions {
-  using PostMutateCallback = absl::FunctionRef<OpStatus(JsonType*)>;
-
-  std::optional<PostMutateCallback> post_mutate_cb;
-  CallbackResultOptions cb_result_options = CallbackResultOptions::DefaultMutateOptions();
-};
-
 template <typename T>
-OpResult<JsonCallbackResult<optional<T>>> JsonMutateOperation(const OpArgs& op_args,
-                                                              std::string_view key,
-                                                              const WrappedJsonPath& json_path,
-                                                              JsonPathMutateCallback<T> cb,
-                                                              MutateOperationOptions options = {}) {
+OpResult<JsonCallbackResult<optional<T>>> JsonMutateOperation(
+    const OpArgs& op_args, std::string_view key, const WrappedJsonPath& json_path,
+    JsonPathMutateCallback<T> cb,
+    CallbackResultOptions cb_result_options = CallbackResultOptions::DefaultMutateOptions()) {
   auto it_res = op_args.GetDbSlice().FindMutable(op_args.db_cntx, key, OBJ_JSON);
   RETURN_ON_BAD_STATUS(it_res);
 
-  JsonMemTracker mem_tracker;
+  JsonAutoUpdater updater(op_args, key, *std::move(it_res));
 
-  PrimeValue& pv = it_res->it->second;
+  auto mutate_res = json_path.ExecuteMutateCallback(updater.GetJson(), cb, cb_result_options);
 
-  JsonType* json_val = pv.GetJson();
-  DCHECK(json_val) << "should have a valid JSON object for key '" << key << "' the type for it is '"
-                   << pv.ObjType() << "'";
-
-  op_args.shard->search_indices()->RemoveDoc(key, op_args.db_cntx, pv);
-
-  auto mutate_res = json_path.ExecuteMutateCallback(json_val, cb, options.cb_result_options);
-
-  // Call post mutate callback
-  if (mutate_res && options.post_mutate_cb) {
-    auto res = options.post_mutate_cb.value()(json_val);
-    // We can not return result here, because we need to update the size
-    if (res != OpStatus::OK) {
-      mutate_res = res;
-    }
-  }
-
-  // we need to manually run this before the PostUpdater run
-  mem_tracker.SetJsonSize(pv, false);
-  it_res->post_updater.Run();
-  op_args.shard->search_indices()->AddDoc(key, op_args.db_cntx, pv);
+  updater.SetJsonSize();
 
   return mutate_res;
 }
@@ -1223,7 +1195,7 @@ auto OpArrPop(const OpArgs& op_args, string_view key, WrappedJsonPath& path, int
     return {false, std::move(str)};
   };
   return JsonMutateOperation<std::string>(op_args, key, path, std::move(cb),
-                                          {{}, CallbackResultOptions{OnEmpty::kSendNil}});
+                                          CallbackResultOptions{OnEmpty::kSendNil});
 }
 
 // Returns numeric vector that represents the new length of the array at each path.