diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts
index 17217ea018..0f17c5a2f5 100644
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@@ -95,9 +95,9 @@ async function invalidateVariables(
   updatedDatasource: Datasource
 ) {
   const existingVariables: DynamicVariable[] =
-    existingDatasource.config?.dynamicVariables
+    existingDatasource.config?.dynamicVariables || []
   const updatedVariables: DynamicVariable[] =
-    updatedDatasource.config?.dynamicVariables
+    updatedDatasource.config?.dynamicVariables || []
   const toInvalidate = []
 
   if (!existingVariables) {
diff --git a/packages/types/src/documents/pouch.ts b/packages/types/src/documents/pouch.ts
index e1de89649c..6ff851a515 100644
--- a/packages/types/src/documents/pouch.ts
+++ b/packages/types/src/documents/pouch.ts
@@ -9,7 +9,7 @@ export interface RowResponse<T extends Document | RowValue> {
   id: string
   key: string
   error: string
-  value: T | RowValue
+  value: T
   doc?: T
 }