diff --git a/src/lib/Hydra/Helper/AddBuilds.pm b/src/lib/Hydra/Helper/AddBuilds.pm
index e26115c3..ca161350 100644
--- a/src/lib/Hydra/Helper/AddBuilds.pm
+++ b/src/lib/Hydra/Helper/AddBuilds.pm
@@ -43,6 +43,8 @@ sub updateDeclarativeJobset {
     );
     my %update = ( name => $jobsetName );
     foreach my $key (@allowed_keys) {
+        # do not pass missing data to let psql assign the default value
+        next unless defined $declSpec->{$key};
         $update{$key} = $declSpec->{$key};
         delete $declSpec->{$key};
     }
diff --git a/src/sql/upgrade-66.sql b/src/sql/upgrade-66.sql
new file mode 100644
index 00000000..27bfa8a0
--- /dev/null
+++ b/src/sql/upgrade-66.sql
@@ -0,0 +1,2 @@
+update Jobsets set type = 0 where type is null;
+alter table Jobsets alter column type set not null;