diff --git a/backend/api/application/services/data_service.py b/backend/api/application/services/data_service.py
index baa25de..0be4780 100644
--- a/backend/api/application/services/data_service.py
+++ b/backend/api/application/services/data_service.py
@@ -345,13 +345,11 @@ def _enrich_columns(
         for column in schema.columns:
             statistics = None
             if column in date_columns:
+                max_value = statistics_dataframe.at[0, f"max_{column.name}"]
+                min_value = statistics_dataframe.at[0, f"min_{column.name}"]
                 statistics = {
-                    "max": statistics_dataframe.at[0, f"max_{column.name}"].strftime(
-                        strftime_format
-                    ),
-                    "min": statistics_dataframe.at[0, f"min_{column.name}"].strftime(
-                        strftime_format
-                    ),
+                    "max": None if pd.isna(max_value) else max_value.strftime(strftime_format),
+                    "min": None if pd.isna(min_value) else min_value.strftime(strftime_format),
                 }
             enriched_columns.append(
                 EnrichedColumn(**column.model_dump(), statistics=statistics)
diff --git a/backend/api/domain/enriched_schema.py b/backend/api/domain/enriched_schema.py
index 0e6a830..4c4b31f 100644
--- a/backend/api/domain/enriched_schema.py
+++ b/backend/api/domain/enriched_schema.py
@@ -7,7 +7,7 @@
 
 
 class EnrichedColumn(Column):
-    statistics: Optional[Dict[str, str]] = None
+    statistics: Optional[Dict[str, Optional[str]]] = None
 
 
 class EnrichedSchemaMetadata(SchemaMetadata):
diff --git a/docs/changelog/api.md b/docs/changelog/api.md
index 07aacc3..60839db 100644
--- a/docs/changelog/api.md
+++ b/docs/changelog/api.md
@@ -1,5 +1,15 @@
 # API Changelog
 
+## v8.1.1 - _2026-06-09_
+
+See [v8.1.1] changes
+
+### Features
+
+- Fixed bug formating dates if they are null
+
+[v8.1.1]: https://github.com/no10ds/rapid/compare/v8.1.0...v8.1.1
+
 ## v8.1.0 - _2026-06-04_
 
 See [v8.1.0] changes
diff --git a/infrastructure/modules/rapid/variables.tf b/infrastructure/modules/rapid/variables.tf
index 279c85e..6187a52 100644
--- a/infrastructure/modules/rapid/variables.tf
+++ b/infrastructure/modules/rapid/variables.tf
@@ -13,13 +13,13 @@ variable "app-replica-count-max" {
 variable "application_version" {
   type        = string
   description = "The version number for the application image (e.g.: v1.0.4, v1.0.x-latest, etc.)"
-  default     = "v8.1.0"
+  default     = "v8.1.1"
 }
 
 variable "ui_version" {
   type        = string
   description = "The version number for the static ui (e.g.: v1.0.0, etc.)"
-  default     = "v8.1.0"
+  default     = "v8.1.1"
 }
 
 variable "catalog_disabled" {