diff --git a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java b/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java
index cf9dbf07..9cc60d5b 100644
--- a/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java
+++ b/src/main/java/org/qora/repository/hsqldb/HSQLDBRepository.java
@@ -508,7 +508,10 @@ public class HSQLDBRepository implements Repository {
 	}
 
 	/** Converts milliseconds from epoch to OffsetDateTime needed for TIMESTAMP WITH TIME ZONE columns. */
-	/* package */ static OffsetDateTime toOffsetDateTime(long timestamp) {
+	/* package */ static OffsetDateTime toOffsetDateTime(Long timestamp) {
+		if (timestamp == null)
+			return null;
+
 		return OffsetDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneOffset.UTC);
 	}