diff --git a/src/block-management/block-manager.js b/src/block-management/block-manager.js
index 896a2dfa32080..1158e7b3a6464 100644
--- a/src/block-management/block-manager.js
+++ b/src/block-management/block-manager.js
@@ -115,7 +115,7 @@ export default class BlockManager extends React.Component<PropsType, StateType>
 		// Update datasource UI
 		const index = this.getDataSourceIndexFromUid( clientId );
 		const dataSource = this.state.dataSource;
-		const block = dataSource.get( this.getDataSourceIndexFromUid( clientId ) );
+		const block = dataSource.get( index );
 		block.attributes = attributes;
 		// Update Redux store
 		this.props.onChange( clientId, attributes );