diff --git a/formwork/src/Cms/Site.php b/formwork/src/Cms/Site.php
index eb25ead2b..ec884e0df 100644
--- a/formwork/src/Cms/Site.php
+++ b/formwork/src/Cms/Site.php
@@ -253,18 +253,12 @@ public function metadata(): MetadataCollection
         }
 
         $defaults = [
-            'charset'     => $this->config->get('system.charset'),
-            'author'      => $this->get('author'),
-            'description' => $this->get('description'),
-            'generator'   => 'Formwork',
+            'charset'   => $this->config->get('system.charset'),
+            'generator' => $this->config->get('system.metadata.setGenerator') ? 'Formwork' : null,
         ];
 
         $data = array_filter([...$defaults, ...$this->data['metadata']]);
 
-        if (!$this->config->get('system.metadata.setGenerator')) {
-            unset($data['generator']);
-        }
-
         return $this->metadata = new MetadataCollection($data);
     }
 
diff --git a/formwork/src/Pages/Page.php b/formwork/src/Pages/Page.php
index 570ff929a..fba48c843 100644
--- a/formwork/src/Pages/Page.php
+++ b/formwork/src/Pages/Page.php
@@ -137,7 +137,6 @@ class Page extends Model implements Stringable
     /**
      * Page metadata
      */
-    #[ReadonlyModelProperty]
     protected MetadataCollection $metadata;
 
     /**