diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index d027418d1..0bd7fae40 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -8,11 +8,14 @@
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
 - [Netbox] Add information about a failed request to the error log to help better understand what happened [#5834](https://github.com/vatesfr/xen-orchestra/issues/5834) (PR [#5842](https://github.com/vatesfr/xen-orchestra/pull/5842))
+- [VM/console] Ability to rescan ISO SRs (PR [#5841](https://github.com/vatesfr/xen-orchestra/pull/5841))
 
 ### Bug fixes
 
 > Users must be able to say: “I had this issue, happy to know it's fixed”
 
+- [VM/disks] Fix `an error has occured` when self service user was on VM disk view (PR [#5841](https://github.com/vatesfr/xen-orchestra/pull/5841))
+
 ### Packages to release
 
 > Packages will be released in the order they are here, therefore, they should
@@ -31,3 +34,4 @@
 > In case of conflict, the highest (lowest in previous list) `$version` wins.
 
 - xo-server-netbox minor
+- xo-web minor
diff --git a/packages/xo-web/src/common/iso-device.js b/packages/xo-web/src/common/iso-device.js
index 51dfe297c..8ac1381c3 100644
--- a/packages/xo-web/src/common/iso-device.js
+++ b/packages/xo-web/src/common/iso-device.js
@@ -108,14 +108,16 @@ export default class IsoDevice extends Component {
           srPredicate={this._getSrPredicate()}
           value={mountedIso}
         />
-        <span className='input-group-btn'>
-          <ActionButton
-            disabled={isEmpty(isoSrs)}
-            handler={this._rescanIsoSrs}
-            icon='refresh'
-            tooltip={_('rescanIsoSrs')}
-          />
-        </span>
+        {!useResourceSet && (
+          <span className='input-group-btn'>
+            <ActionButton
+              disabled={isEmpty(isoSrs)}
+              handler={this._rescanIsoSrs}
+              icon='refresh'
+              tooltip={_('rescanIsoSrs')}
+            />
+          </span>
+        )}
         <span className='input-group-btn'>
           <ActionButton disabled={!mountedIso} handler={this._handleEject} icon='vm-eject' />
         </span>