diff --git a/unpublishedScripts/marketplace/clap/clapApp.js b/unpublishedScripts/marketplace/clap/clapApp.js
index de58b08e8e..05df03baf6 100644
--- a/unpublishedScripts/marketplace/clap/clapApp.js
+++ b/unpublishedScripts/marketplace/clap/clapApp.js
@@ -21,7 +21,11 @@ var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
 // Define Menu
 var blackIcon = Script.resolvePath("icons/tablet-icons/clap-a.svg?foxv2");
 var whiteIcon = Script.resolvePath("icons/tablet-icons/clap-i.svg?foxv2");
-var isActive = true;
+
+if ( Settings.getValue("clapAppEnabled") === undefined){
+    Settings.setValue("clapAppEnabled", true);
+}
+var isActive = Settings.getValue("clapAppEnabled");
 
 var activeButton = tablet.addButton({
     icon: whiteIcon,
@@ -38,6 +42,7 @@ if (isActive) {
 function onClick(enabled) {
 
     isActive = !isActive;
+    Settings.setValue("clapAppEnabled", isActive);
     activeButton.editProperties({
         isActive: isActive
     });
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
index 04a3ebc4af..9e7a592c01 100644
--- a/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapDebugger.js
@@ -78,17 +78,6 @@ module.exports = {
         });
     },
 
-    clapSphere: function (pos, vol) {
-        Overlays.editOverlay(DEBUG_CLAP, {
-            position: pos,
-            scale: {
-                x: vol,
-                y: vol,
-                z: vol
-            }
-        });
-    },
-
     enableDebug: function () {
         DEBUG_RIGHT_HAND = Overlays.addOverlay("line3d", {
             color: DEBUG_WRONG,
diff --git a/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
index 7f57e9f4aa..1a5f6665e1 100644
--- a/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
+++ b/unpublishedScripts/marketplace/clap/scripts/ClapEngine.js
@@ -80,10 +80,6 @@ function clap(volume, position, rotation) {
     }
 
 
-    if (settingDebug) {
-        ClapDebugger.clapSphere(position, volume);
-    }
-
 }
 // Helper Functions
 function getHandFingerAnim(side) {
@@ -282,12 +278,10 @@ module.exports = {
         });
         Controller.enableMapping(CONTROL_MAP_PACKAGE);
 
-        // settingDebug STUFF
         if (settingDebug) {
             ClapDebugger.enableDebug();
         }
 
-
         Script.update.connect(update);
 
         Script.scriptEnding.connect(this.disconnectEngine);
@@ -308,6 +302,7 @@ module.exports = {
         }
         restoreFingerRoleAnimation('left');
         restoreFingerRoleAnimation('right');
+
         Controller.disableMapping(CONTROL_MAP_PACKAGE);
         try {
             Script.update.disconnect(update);