diff --git a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
index a8d0ba9a..e3c9123e 100644
--- a/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
+++ b/MVMCoreUI/Atomic/Atoms/Views/LoadImageView.swift
@@ -12,6 +12,7 @@ import UIKit
     public let loadingSpinner = MFLoadingSpinner(frame: .zero)
     public let imageView = MFTransparentGIFView(frame: .zero)
     public var addSizeConstraintsForAspectRatio = false
+    public var shouldNotifyDelegateOnUpdate = true
     var centerX: NSLayoutConstraint?
     var centerY: NSLayoutConstraint?
     var widthConstraint: NSLayoutConstraint?
@@ -264,16 +265,15 @@ import UIKit
             }
             
             let finishedLoadingBlock: MVMCoreGetImageBlock = {[weak self] (image, data, isFallbackImage) in MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
-                guard let loadingImageName = self?.currentImageName, loadingImageName == imageName else {
-                    return
-                }
-                self?.isFallbackImage = isFallbackImage
-                self?.loadingSpinner.pause()
-                let layoutWillChange = self?.layoutWillChange(width: self?.currentImageWidth, height: self?.currentImageHeight, size: image?.size) ?? false
-                self?.addConstraints(width: width, height: height, size: image?.size)
-                self?.loadingSpinnerHeightConstraint?.constant = 0
+                guard let self = self,
+                    let loadingImageName = self.currentImageName, loadingImageName == imageName else { return }
+                self.isFallbackImage = isFallbackImage
+                self.loadingSpinner.pause()
+                let layoutWillChange = self.shouldNotifyDelegateOnUpdate ? self.layoutWillChange(width: self.currentImageWidth, height: self.currentImageHeight, size: image?.size) : false
+                self.addConstraints(width: width, height: height, size: image?.size)
+                self.loadingSpinnerHeightConstraint?.constant = 0
                 if layoutWillChange {
-                    self?.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self!)
+                    self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
                 }
                 completionBlock(image,data,isFallbackImage)
             })}
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
index c39bce65..e6e226cb 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonMedium.swift
@@ -43,6 +43,7 @@ import Foundation
     // MARK: - MFViewProtocol
     open override func setupView() {
         super.setupView()
+        rightImageView.shouldNotifyDelegateOnUpdate = false
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
index 77a189c2..e8436620 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexButtonSmall.swift
@@ -43,6 +43,7 @@ import Foundation
     // MARK: - MFViewProtocol
     open override func setupView() {
         super.setupView()
+        rightImageView.shouldNotifyDelegateOnUpdate = false
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
index f53da09c..573335c0 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkMedium.swift
@@ -46,6 +46,7 @@ import Foundation
     //-----------------------------------------------------
     open override func setupView() {
         super.setupView()
+        rightImage.shouldNotifyDelegateOnUpdate = false
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()
diff --git a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
index 5ba8ac97..49173067 100644
--- a/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
+++ b/MVMCoreUI/Atomic/Molecules/DesignedComponents/List/Device/ListDeviceComplexLinkSmall.swift
@@ -46,6 +46,7 @@ import Foundation
     //-----------------------------------------------------
     open override func setupView() {
         super.setupView()
+        rightImage.shouldNotifyDelegateOnUpdate = false
         addMolecule(stack)
         stack.restack()
         verticalStack.restack()