diff --git a/src/blocks/remote-data-container/edit.tsx b/src/blocks/remote-data-container/edit.tsx
index c9978c5d..350ac665 100644
--- a/src/blocks/remote-data-container/edit.tsx
+++ b/src/blocks/remote-data-container/edit.tsx
@@ -44,7 +44,10 @@ export function Edit( props: BlockEditProps< RemoteDataBlockAttributes > ) {
 			.then( remoteData => {
 				if ( remoteData ) {
 					updateRemoteData(
-						{ queryInputOverrides: props.attributes.remoteData.queryInputOverrides, ...remoteData },
+						{
+							queryInputOverrides: props.attributes.remoteData?.queryInputOverrides,
+							...remoteData,
+						},
 						insertBlocks
 					);
 				}