diff --git a/src/services/grpc/api/get-user-data.ts b/src/services/grpc/api/get-user-data.ts
index 33539a7..6682c79 100644
--- a/src/services/grpc/api/get-user-data.ts
+++ b/src/services/grpc/api/get-user-data.ts
@@ -38,9 +38,9 @@ export async function getUserData(_request: Empty, context: CallContext & Authen
 				priceId: pnid.connections.stripe.price_id,
 				tierLevel: pnid.connections.stripe.tier_level,
 				tierName: pnid.connections.stripe.tier_name,
-				latestWebhookTimestamp: BigInt(pnid.connections.stripe.latest_webhook_timestamp)
+				latestWebhookTimestamp: BigInt(pnid.connections.stripe.latest_webhook_timestamp ?? 0)
 			}
 		},
 		marketingFlag: pnid.flags.marketing
 	};
-}
\ No newline at end of file
+}
diff --git a/src/services/grpc/api/update-user-data.ts b/src/services/grpc/api/update-user-data.ts
index ae90135..bb82887 100644
--- a/src/services/grpc/api/update-user-data.ts
+++ b/src/services/grpc/api/update-user-data.ts
@@ -40,9 +40,9 @@ export async function updateUserData(_request: UpdateUserDataRequest, context: C
 				priceId: pnid.connections.stripe.price_id,
 				tierLevel: pnid.connections.stripe.tier_level,
 				tierName: pnid.connections.stripe.tier_name,
-				latestWebhookTimestamp: BigInt(pnid.connections.stripe.latest_webhook_timestamp)
+				latestWebhookTimestamp: BigInt(pnid.connections.stripe.latest_webhook_timestamp ?? 0)
 			}
 		},
 		marketingFlag: pnid.flags.marketing
 	};
-}
\ No newline at end of file
+}