diff --git a/CHANGELOG.md b/CHANGELOG.md
index 923a69319..38e9cc1bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Fixed the create or edit activity dialog
+
 ## 1.227.0 - 2023-01-14
 
 ### Added
diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
index f9f5a595f..8b967ab0e 100644
--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts
@@ -120,7 +120,7 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
         Validators.required
       ],
       tags: [
-        this.data.activity?.tags.map(({ id, name }) => {
+        this.data.activity?.tags?.map(({ id, name }) => {
           return {
             id,
             name: translate(name)