diff --git a/support-core/src/main/java/no/entur/abt/mapstruct/common/ProtobufStandardMappings.java b/support-core/src/main/java/no/entur/abt/mapstruct/common/ProtobufStandardMappings.java
index 24cb783..7a27c05 100644
--- a/support-core/src/main/java/no/entur/abt/mapstruct/common/ProtobufStandardMappings.java
+++ b/support-core/src/main/java/no/entur/abt/mapstruct/common/ProtobufStandardMappings.java
@@ -146,6 +146,9 @@ default Instant mapToInstant(Timestamp t) {
         if (t == null) {
             return null;
         }
+        if (Timestamp.getDefaultInstance().equals(from)) {
+            return Instant.EPOCH;
+        }        
 
         Timestamp sanitized = Timestamps.sanitize(t);
 
@@ -160,6 +163,9 @@ default Timestamp mapToTimestamp(Instant i) {
         if (i == null) {
             return null;
         }
+        if (i.getEpochSecond() == 0) {
+            return Timestamp.getDefaultInstance();
+        }        
 
         Timestamp t = Timestamp.newBuilder().setSeconds(i.getEpochSecond()).setNanos(i.getNano()).build();
         return Timestamps.sanitize(t);