diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index 788832119f..98b228082a 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -34,17 +34,14 @@ interface IProps extends IDialogProps {
 const BetaFeedbackDialog: React.FC<IProps> = ({ featureId, onFinished }) => {
     const info = SettingsStore.getBetaInfo(featureId);
 
-    const extraData = SettingsStore.getBetaInfo(featureId)?.extraSettings.reduce((o, k) => {
-        o[k] = SettingsStore.getValue(k);
-        return o;
-    }, {});
-
     return <GenericFeatureFeedbackDialog
         title={_t("%(featureName)s beta feedback", { featureName: info.title })}
         subheading={_t(info.feedbackSubheading)}
         onFinished={onFinished}
         rageshakeLabel={info.feedbackLabel}
-        rageshakeData={extraData}
+        rageshakeData={Object.fromEntries((SettingsStore.getBetaInfo(featureId)?.extraSettings || []).map(k => {
+            return SettingsStore.getValue(k);
+        }))}
     >
         <AccessibleButton kind="link" onClick={() => {
             onFinished(false);
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 279ae1165b..ee01984db0 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -73,19 +73,23 @@ const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
         <hr />
         <div>
             <span className="mx_SpaceFeedbackPrompt_text">{ _t("Spaces are a new feature.") }</span>
-            <AccessibleButton kind="link" onClick={() => {
-                if (onClick) onClick();
-                Modal.createTrackedDialog("Spaces Feedback", "", GenericFeatureFeedbackDialog, {
-                    title: _t("Spaces feedback"),
-                    subheading: _t("Thank you for trying Spaces. Your feedback will help inform the next versions."),
-                    rageshakeLabel: "spaces-feedback",
-                    rageshakeData: {
-                        "feature_spaces.all_rooms": SettingsStore.getValue("feature_spaces.all_rooms"),
-                        "feature_spaces.space_member_dms": SettingsStore.getValue("feature_spaces.space_member_dms"),
-                        "feature_spaces.space_dm_badges": SettingsStore.getValue("feature_spaces.space_dm_badges"),
-                    },
-                });
-            }}>
+            <AccessibleButton
+                kind="link"
+                onClick={() => {
+                    if (onClick) onClick();
+                    Modal.createTrackedDialog("Spaces Feedback", "", GenericFeatureFeedbackDialog, {
+                        title: _t("Spaces feedback"),
+                        subheading: _t("Thank you for trying Spaces. " +
+                            "Your feedback will help inform the next versions."),
+                        rageshakeLabel: "spaces-feedback",
+                        rageshakeData: Object.fromEntries([
+                            "feature_spaces.all_rooms",
+                            "feature_spaces.space_member_dms",
+                            "feature_spaces.space_dm_badges",
+                        ].map(k => [k, SettingsStore.getValue(k)])),
+                    });
+                }}
+            >
                 { _t("Give feedback.") }
             </AccessibleButton>
         </div>