diff --git a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/teasergrid_controller.js b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/teasergrid_controller.js
index 405977ae..ff684980 100644
--- a/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/teasergrid_controller.js
+++ b/public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/controllers/teasergrid_controller.js
@@ -17,8 +17,12 @@ export default class extends Controller {
     }
 
     disabledValueChanged() {
-        this.containerTarget.classList.toggle(this.gridClass, this.disabledValue === false)
-        let icon = this.disabledValue ? '#icon-grid' : '#icon-block'
-        this.iconTarget.setAttribute('href', icon)
+        if (this.hasContainerTarget) {
+            this.containerTarget.classList.toggle(this.gridClass, this.disabledValue === false)
+        }
+        if (this.hasIconTarget) {
+            let icon = this.disabledValue ? '#icon-grid' : '#icon-block'
+            this.iconTarget.setAttribute('href', icon)
+        }
     }
 }