diff --git a/js/controllers/clipper_controller.js b/js/controllers/clipper_controller.js
index 07551a2..3eb34d9 100644
--- a/js/controllers/clipper_controller.js
+++ b/js/controllers/clipper_controller.js
@@ -56,16 +56,16 @@ export default class extends Controller {
             btn.classList.remove('border', 'border-2', 'border-warning');
         });
 
-        // AO should be turned off if clipping is enabled
-        toggleAmbientOcclusion(!this.enabledValue);
-
         if (this.enabledValue) {
+            // AO should be turned off if clipping is enabled
+            toggleAmbientOcclusion(false);
             trigger.className += ' border border-2 border-white';
         }
 
         if (!this.enabledValue) {
             resetClipping();
             trigger.className = trigger.className.replace(/ border.*$/g, '');
+            toggleAmbientOcclusion(AppState.ambientOcclusion);
         }
 
         AppState.clipping.enabled = this.enabledValue;