diff --git a/packages/volto/news/6132.bugfix b/packages/volto/news/6132.bugfix
new file mode 100644
index 0000000000..73db65cf37
--- /dev/null
+++ b/packages/volto/news/6132.bugfix
@@ -0,0 +1 @@
+Cleanup Image widget and pass down onSelectItem prop if any @sneridagh
diff --git a/packages/volto/src/components/manage/Blocks/Image/Edit.jsx b/packages/volto/src/components/manage/Blocks/Image/Edit.jsx
index c0e2f418fc..6483a8846d 100644
--- a/packages/volto/src/components/manage/Blocks/Image/Edit.jsx
+++ b/packages/volto/src/components/manage/Blocks/Image/Edit.jsx
@@ -4,13 +4,8 @@
  */
 
 import React from 'react';
-import { connect } from 'react-redux';
-import { compose } from 'redux';
-
-import { injectIntl } from 'react-intl';
 import cx from 'classnames';
 import { ImageSidebar, SidebarPortal } from '@plone/volto/components';
-import { createContent } from '@plone/volto/actions';
 
 import {
   flattenToAppURL,
@@ -21,18 +16,6 @@ import config from '@plone/volto/registry';
 
 import { ImageInput } from '@plone/volto/components/manage/Widgets/ImageWidget';
 
-/**
- * Edit image block function.
- * @function Edit
- */
-
-// const messages = defineMessages({
-//   notImage: {
-//     id: 'The provided link does not lead to an image.',
-//     defaultMessage: 'The provided link does not lead to an image.',
-//   },
-// });
-
 function Edit(props) {
   const { data } = props;
   const Image = config.getComponent({ name: 'Image' }).component;
@@ -120,14 +103,4 @@ function Edit(props) {
   );
 }
 
-export default compose(
-  injectIntl,
-  withBlockExtensions,
-  connect(
-    (state, ownProps) => ({
-      request: state.content.subrequests[ownProps.block] || {},
-      content: state.content.subrequests[ownProps.block]?.data,
-    }),
-    { createContent },
-  ),
-)(Edit);
+export default withBlockExtensions(Edit);
diff --git a/packages/volto/src/components/manage/Widgets/ImageWidget.jsx b/packages/volto/src/components/manage/Widgets/ImageWidget.jsx
index f7a436c862..105c60bb45 100644
--- a/packages/volto/src/components/manage/Widgets/ImageWidget.jsx
+++ b/packages/volto/src/components/manage/Widgets/ImageWidget.jsx
@@ -75,6 +75,7 @@ const UnconnectedImageInput = (props) => {
     objectBrowserPickerType = 'image',
     description,
     placeholderLinkInput = '',
+    onSelectItem,
   } = props;
 
   const intl = useIntl();
@@ -204,16 +205,15 @@ const UnconnectedImageInput = (props) => {
                           e.preventDefault();
                           openObjectBrowser({
                             mode: objectBrowserPickerType,
-                            onSelectItem: (
-                              url,
-                              { title, image_field, image_scales },
-                            ) => {
-                              onChange(props.id, flattenToAppURL(url), {
-                                title,
-                                image_field,
-                                image_scales,
-                              });
-                            },
+                            onSelectItem: onSelectItem
+                              ? onSelectItem
+                              : (url, { title, image_field, image_scales }) => {
+                                  onChange(props.id, flattenToAppURL(url), {
+                                    title,
+                                    image_field,
+                                    image_scales,
+                                  });
+                                },
                             currentPath: contextUrl,
                           });
                         }}