diff --git a/stackit/internal/services/postgresflexalpha/flavor/datasource.go b/stackit/internal/services/postgresflexalpha/flavor/datasource.go
index 715c68ed..ee7177f6 100644
--- a/stackit/internal/services/postgresflexalpha/flavor/datasource.go
+++ b/stackit/internal/services/postgresflexalpha/flavor/datasource.go
@@ -220,14 +220,24 @@ func (r *flavorDataSource) Read(ctx context.Context, req datasource.ReadRequest,
 	} else {
 		var scList []attr.Value
 		for _, sc := range f.StorageClasses {
+			mIop := types.Int32Null()
+			if val, ok := sc.GetMaxIoPerSecOk(); ok {
+				mIop = types.Int32Value(*val)
+			}
+
+			mThrough := types.Int32Null()
+			if val, ok := sc.GetMaxThroughInMbOk(); ok {
+				mThrough = types.Int32Value(*val)
+			}
+
 			scList = append(
 				scList,
 				postgresflexalphaGen.NewStorageClassesValueMust(
 					postgresflexalphaGen.StorageClassesValue{}.AttributeTypes(ctx),
 					map[string]attr.Value{
 						"class":             types.StringValue(sc.Class),
-						"max_io_per_sec":    types.Int64Value(int64(sc.GetMaxIoPerSec())),
-						"max_through_in_mb": types.Int64Value(int64(sc.GetMaxThroughInMb())),
+						"max_io_per_sec":    mIop,
+						"max_through_in_mb": mThrough,
 					},
 				),
 			)