diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index 27e68737..e3115218 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -877,7 +877,6 @@ sub checkBuild {
             , drvpath => $drvPath
             , outpath => $outPath
             , system => $buildInfo->{system}
-            , iscurrent => 1
             , nixexprinput => $jobset->nixexprinput
             , nixexprpath => $jobset->nixexprpath
 	    , priority => $priority
diff --git a/src/script/hydra-evaluator b/src/script/hydra-evaluator
index 9b0165a0..33d1c8ce 100755
--- a/src/script/hydra-evaluator
+++ b/src/script/hydra-evaluator
@@ -169,8 +169,10 @@ sub checkJobset {
                 $ev->jobsetevalmembers->create({ build => $id, isnew => $new });
             }
             print STDERR "  created new eval ", $ev->id, "\n";
+            $ev->builds->update({iscurrent => 1});
         } else {
             print STDERR "  created cached eval ", $ev->id, "\n";
+            $prevEval->builds->update({iscurrent => 1});
         }
     });