diff --git a/pkg/database/tagGroup.go b/pkg/database/tagGroup.go
index f90a7a6..08f8f12 100644
--- a/pkg/database/tagGroup.go
+++ b/pkg/database/tagGroup.go
@@ -33,6 +33,14 @@ func CreateTagGroup(ctx context.Context, tagGroupName models.TagGroupName, tagNa
 		return models.TagGroup{}, utils.HandleError(ctx, span, localLogger, &otterError.Database{Reason: otterError.DatabaseIsNotConnected})
 	}
 
+	if tagGroupName == "" {
+		return models.TagGroup{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.TagGroupNameIsEmpty})
+	}
+
+	if tagName == "" {
+		return models.TagGroup{}, utils.HandleError(ctx, span, localLogger, &otterError.EntityValidationFailed{Reason: otterError.TagNameIsEmpty})
+	}
+
 	tagGroup := models.TagGroup{
 		Name:  tagGroupName,
 		TagID: tagName,