lib/PublicInbox/IMAPTracker.pm  | 5 +++--
 lib/PublicInbox/WatchMaildir.pm | 4 ++--

diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index 92f21584842d97d2d6d1d3747596e251ad8719d6..be9caf7648bf3f59ede7caff161f813ed2372022 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -49,13 +49,14 @@ 	$sth->fetchrow_array;
 }
 
 sub update_last ($$$) {
-	my ($self, $validity, $last) = @_;
+	my ($self, $validity, $last_uid) = @_;
+	return unless defined $last_uid;
 	my $sth = $self->{dbh}->prepare_cached(<<'');
 INSERT OR REPLACE INTO imap_last (url, uid_validity, uid)
 VALUES (?, ?, ?)
 
 	$self->lock_acquire;
-	my $rv = $sth->execute($self->{url}, $validity, $last);
+	my $rv = $sth->execute($self->{url}, $validity, $last_uid);
 	$self->lock_release;
 	$rv;
 }
diff --git a/lib/PublicInbox/WatchMaildir.pm b/lib/PublicInbox/WatchMaildir.pm
index 78aec8a25d5f4b6cfd3103917ecc93aed6ba2a7b..a227a6fd2719746e77070432285db893d5c890c7 100644
--- a/lib/PublicInbox/WatchMaildir.pm
+++ b/lib/PublicInbox/WatchMaildir.pm
@@ -494,7 +494,7 @@ 			}
 			last if $self->{quit};
 		}
 		_done_for_now($self);
-		$itrk->update_last($r_uidval, $last_uid) if defined $last_uid;
+		$itrk->update_last($r_uidval, $last_uid);
 	} until ($err || $self->{quit});
 	$err;
 }
@@ -919,7 +919,7 @@ 		}
 		$last_art = $art;
 	}
 	_done_for_now($self);
-	$itrk->update_last(0, $last_art) if defined $last_art;
+	$itrk->update_last(0, $last_art);
 	$err;
 }