diff --git a/handler/handler.go b/handler/handler.go
index 8364176..f20a791 100644
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -107,7 +107,10 @@ func (h *ContentPublishedHandler) Handle(ctx context.Context, cpEvent *models.Co
 		datasetDetailsData := models.DatasetDetails{
 			Title:       datasetMetadataPublished.Title,
 			Description: datasetMetadataPublished.Description,
-			Keywords:    *datasetMetadataPublished.Keywords,
+		}
+
+		if datasetMetadataPublished.Keywords != nil {
+			datasetDetailsData.Keywords = *datasetMetadataPublished.Keywords
 		}
 
 		versionMetadata := models.CMDData{