diff --git a/projectmanagement/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreview.java b/projectmanagement/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreview.java
index 8319b896b..7a9ba5fcd 100644
--- a/projectmanagement/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreview.java
+++ b/projectmanagement/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreview.java
@@ -154,11 +154,11 @@ public String specimen() {
   public String analyte() {
     return analyte;
   }
-  public String analysisType() {
-    return analysisType;
+  public Optional<String> analysisType() {
+    return Optional.ofNullable(analysisType);
   }
-  public String comment() {
-    return comment;
+  public Optional<String> comment() {
+    return Optional.ofNullable(comment);
   }
 
   public ExperimentalGroup experimentalGroup() {