diff --git a/backend/src/app.ts b/backend/src/app.ts
index f45ec70..366c51a 100644
--- a/backend/src/app.ts
+++ b/backend/src/app.ts
@@ -318,15 +318,6 @@ const weightSchema = z.object({
   recordedOn: dateStringSchema,
   notes: z.string().trim().max(280).optional().or(z.literal('')),
 });
-const weightEditWindowDays = 3;
-
-const getWeightEditEarliestDate = () => {
-  const earliestDate = new Date();
-  earliestDate.setDate(earliestDate.getDate() - (weightEditWindowDays - 1));
-  return earliestDate.toISOString().slice(0, 10);
-};
-
-const isWeightDateEditable = (recordedOn: string) => recordedOn >= getWeightEditEarliestDate();
 
 const vetVisitSchema = z.object({
   visitedOn: dateStringSchema,
@@ -4185,11 +4176,6 @@ app.put(
         return;
       }
 
-      if (!isWeightDateEditable(parsed.data.recordedOn)) {
-        res.status(409).json({ error: 'Weight entries can only be edited for the last 3 days.' });
-        return;
-      }
-
       const weight = await updateWeightForBird(
         req.params.weightId,
         req.params.birdId,
diff --git a/backend/src/repositories/birdRepository.ts b/backend/src/repositories/birdRepository.ts
index ce7ecc7..15fff9c 100644
--- a/backend/src/repositories/birdRepository.ts
+++ b/backend/src/repositories/birdRepository.ts
@@ -909,7 +909,13 @@ export const updateWeightForBird = async (
          notes = $5
      WHERE id = $1
        AND bird_id = $2
-       AND recorded_on >= CURRENT_DATE - (2 * INTERVAL '1 day')
+       AND id IN (
+         SELECT recent.id
+         FROM weight_records recent
+         WHERE recent.bird_id = $2
+         ORDER BY recent.recorded_on DESC, recent.created_at DESC
+         LIMIT 3
+       )
      RETURNING id, bird_id, weight_grams, recorded_on::text, notes`,
     [weightId, birdId, weightGrams, recordedOn, notes],
   );
diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index 4d27030..82cd589 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -917,13 +917,8 @@ const formatAuditAction = (value: string) =>
 const formatWeight = (value: number | null) => (value ? `${value.toFixed(1)} g` : 'Pending');
 const formatRange = (minGrams: number, maxGrams: number) => `${minGrams.toFixed(0)}-${maxGrams.toFixed(0)} g`;
 const parseDateValue = (value: string) => new Date(`${value}T00:00:00`);
-const WEIGHT_EDIT_WINDOW_DAYS = 3;
-const getWeightEditEarliestDate = () => {
-  const earliestDate = new Date();
-  earliestDate.setDate(earliestDate.getDate() - (WEIGHT_EDIT_WINDOW_DAYS - 1));
-  return earliestDate.toISOString().slice(0, 10);
-};
-const isWeightEditable = (weight: WeightRecord) => weight.recordedOn >= getWeightEditEarliestDate();
+const getEditableWeights = (entries: WeightRecord[]) =>
+  [...entries].sort((left, right) => right.recordedOn.localeCompare(left.recordedOn)).slice(0, 3);
 const daysBetweenDates = (startDate: string, endDate: string) =>
   Math.abs(parseDateValue(endDate).getTime() - parseDateValue(startDate).getTime()) / (24 * 60 * 60 * 1000);
 const addYearsToDate = (date: Date, years: number) => {
@@ -1750,6 +1745,8 @@ function App() {
       ),
     [allBirdWeights, birds, overviewWindowStartDate],
   );
+  const editableWeights = useMemo(() => getEditableWeights(weights), [weights]);
+  const editableWeightIds = useMemo(() => new Set(editableWeights.map((weight) => weight.id)), [editableWeights]);
 
   const showFlockDetailColumn = bulkWeightOpen || birdEditorOpen || Boolean(selectedBird);
 
@@ -3692,8 +3689,8 @@ function App() {
   };
 
   const handleEditWeight = (weight: WeightRecord) => {
-    if (!isWeightEditable(weight)) {
-      setError('Weight entries can only be edited for the last 3 days.');
+    if (!editableWeightIds.has(weight.id)) {
+      setError('Only the 3 most recent weight entries can be edited.');
       return;
     }
 
@@ -7068,8 +7065,7 @@ function App() {
                         <input
 	                          type="date"
 	                          value={weightForm.recordedOn}
-	                          min={editingWeightId ? getWeightEditEarliestDate() : undefined}
-	                          onChange={(event) => setWeightForm({ ...weightForm, recordedOn: event.target.value })}
+		                          onChange={(event) => setWeightForm({ ...weightForm, recordedOn: event.target.value })}
 	                          required
 	                        />
                       </label>
@@ -7094,10 +7090,8 @@ function App() {
 	                      </div>
 		                    </form>
 			                    <div className="recent-list">
-				                      {[...weights]
-				                        .filter(isWeightEditable)
-				                        .sort((left, right) => right.recordedOn.localeCompare(left.recordedOn))
-				                        .map((weight) => (
+					                      {editableWeights
+					                        .map((weight) => (
 				                            <article className="vet-visit-card" key={weight.id}>
 				                              <strong>{formatWeight(weight.weightGrams)}</strong>
 				                              <span>{formatDate(weight.recordedOn)}</span>
@@ -7109,7 +7103,7 @@ function App() {
 				                              </div>
 				                            </article>
 				                        ))}
-			                      {!weights.some(isWeightEditable) ? <p className="muted">No editable weight entries from the last 3 days.</p> : null}
+				                      {!editableWeights.length ? <p className="muted">No weight entries recorded yet.</p> : null}
 			                    </div>
 		                  </section>
 	                    </div>