diff --git a/EXTENSION_VERSION b/EXTENSION_VERSION
index 1f7391f92b..be59ceb929 100644
--- a/EXTENSION_VERSION
+++ b/EXTENSION_VERSION
@@ -1 +1 @@
-master
+feature_metric_rollup
diff --git a/pkg/dataset/config.go b/pkg/dataset/config.go
index 1079cb3d15..4911f27a25 100644
--- a/pkg/dataset/config.go
+++ b/pkg/dataset/config.go
@@ -68,7 +68,7 @@ func NewConfig(contents string) (cfg Config, err error) {
 func (c *Config) Apply(ctx context.Context, conn *pgx.Conn) error {
 	c.applyDefaults()
 
-	if c.Metrics.Rollups.Enabled {
+	if c.Metrics.Rollups != nil && c.Metrics.Rollups.Enabled {
 		if err := c.Metrics.Rollups.Apply(ctx, conn); err != nil {
 			return fmt.Errorf("error applying configuration for downsampling: %w", err)
 		}