diff --git a/packages/js/data/changelog/fix-export-button-error b/packages/js/data/changelog/fix-export-button-error
new file mode 100644
index 00000000000..94c6897331e
--- /dev/null
+++ b/packages/js/data/changelog/fix-export-button-error
@@ -0,0 +1,4 @@
+Significance: fix
+Type: minor
+
+Fix 'Cannot read properties of undefined' error when clicking Export button on Analytic pages.
\ No newline at end of file
diff --git a/packages/js/data/src/export/index.ts b/packages/js/data/src/export/index.ts
index 7db116b2668..278aee7dd12 100644
--- a/packages/js/data/src/export/index.ts
+++ b/packages/js/data/src/export/index.ts
@@ -2,7 +2,6 @@
  * External dependencies
  */
 import { registerStore } from '@wordpress/data';
-import { controls } from '@wordpress/data-controls';
 import { SelectFromMap, DispatchFromMap } from '@automattic/data-stores';
 import { Reducer, AnyAction } from 'redux';
 /**
@@ -13,6 +12,7 @@ import * as selectors from './selectors';
 import * as actions from './actions';
 import reducer, { State } from './reducer';
 import { WPDataSelectors } from '../types';
+import controls from '../controls';
 export * from './types';
 export type { State };
 
diff --git a/plugins/woocommerce/changelog/fix-33583-cannot-read-property-on-clicking-download-btn b/plugins/woocommerce/changelog/fix-33583-cannot-read-property-on-clicking-download-btn
new file mode 100644
index 00000000000..be665c1c637
--- /dev/null
+++ b/plugins/woocommerce/changelog/fix-33583-cannot-read-property-on-clicking-download-btn
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Import correct controls for export function