diff --git a/ScenariMicroservizio/bin/utility/Esecutore.class b/ScenariMicroservizio/bin/utility/Esecutore.class
index 2c473e7e0dbf696f74b1a21cf6f7f2de2af8e25e..6ae463a6f1f9ba980e095ee57b2896312012d4df 100644
Binary files a/ScenariMicroservizio/bin/utility/Esecutore.class and b/ScenariMicroservizio/bin/utility/Esecutore.class differ
diff --git a/ScenariMicroservizio/bin/utility/SubscribeCallback.class b/ScenariMicroservizio/bin/utility/SubscribeCallback.class
index 819675171f3de7c9b278eb15d0baf0c47540e081..5e462acfd5f3be7719e2fb7371cf6c026eb3ff7a 100644
Binary files a/ScenariMicroservizio/bin/utility/SubscribeCallback.class and b/ScenariMicroservizio/bin/utility/SubscribeCallback.class differ
diff --git a/ScenariMicroservizio/bin/utility/UserChangeSync.class b/ScenariMicroservizio/bin/utility/UserChangeSync.class
index 3a198509ded45c834a1aaf705e06cdae3162d60d..c90d08be2cc69ace9a1b603a50717abd66647d4e 100644
Binary files a/ScenariMicroservizio/bin/utility/UserChangeSync.class and b/ScenariMicroservizio/bin/utility/UserChangeSync.class differ
diff --git a/ScenariMicroservizio/res/CONF/esecutore.json b/ScenariMicroservizio/res/CONF/esecutore.json
index 1c1996069bc63c8c3533b128084fcd350ccb651b..b77a9e187846f3b40d7b696db0e3caf6f834a55b 100644
--- a/ScenariMicroservizio/res/CONF/esecutore.json
+++ b/ScenariMicroservizio/res/CONF/esecutore.json
@@ -1 +1 @@
-{"scenario-attivo":""}
+{"scenario-attivo":"scenario-2022-07-13T15-37-31.602719.json"}
diff --git a/ScenariMicroservizio/res/db-scenari/none b/ScenariMicroservizio/res/db-scenari/none
new file mode 100644
index 0000000000000000000000000000000000000000..18d13077ac7376d0fc7800ac3077ddcf0a240c08
--- /dev/null
+++ b/ScenariMicroservizio/res/db-scenari/none
@@ -0,0 +1 @@
+This file is used to remember that the user chose not to activate any scenario
\ No newline at end of file
diff --git a/ScenariMicroservizio/src/utility/Esecutore.java b/ScenariMicroservizio/src/utility/Esecutore.java
index 27698f06298d1e78cc34996113bf2f63ed50b21b..70f03f4c880aacf870058618ca5208a22f88d3bd 100644
--- a/ScenariMicroservizio/src/utility/Esecutore.java
+++ b/ScenariMicroservizio/src/utility/Esecutore.java
@@ -19,7 +19,7 @@ public class Esecutore extends Thread {
 
 	private final Automa automa;
 	private final Scenari scenari;
-	private final String DB_FOLDER = Scenari.RES_FOLDER + "db-scenari/";
+	final String DB_FOLDER = Scenari.RES_FOLDER + "db-scenari/";
 	private File scenarioAttivo = null;
 	private final ArrayList<File> filesRead = new ArrayList<File>();
 	private boolean isDonePublishing = false;
@@ -137,8 +137,8 @@ public class Esecutore extends Thread {
 	//							System.out.println(waitingTime);
 								if (waitingTime > 1000) {
 									System.out.println("will sleep for "+waitingTime/1000);
-	//								Thread.sleep(waitingTime);
-									wait(waitingTime);
+									Thread.sleep(waitingTime);
+//									wait(waitingTime);
 								}
 	
 	//							System.out.println("running...");
diff --git a/ScenariMicroservizio/src/utility/SubscribeCallback.java b/ScenariMicroservizio/src/utility/SubscribeCallback.java
index f8656626fd4ce42b99557448ccf3e58dafe29cf3..609156d763ff0669ee15b70ce79b0cfcaefeded7 100644
--- a/ScenariMicroservizio/src/utility/SubscribeCallback.java
+++ b/ScenariMicroservizio/src/utility/SubscribeCallback.java
@@ -244,7 +244,7 @@ public class SubscribeCallback implements MqttCallback{
 //			invio lo scenario attivo
 			if(antifurto) {
 				String scenarioAttivo = esec.getScenarioAttivo();
-				if(scenarioAttivo != null) {
+				if(scenarioAttivo != null && !scenarioAttivo.equals("none")) {
 					JSONObject scenarioValori = new JSONObject();
 					System.out.println(scenarioAttivo);
 					scenarioValori.put("nome", scenarioAttivo.substring(0,28));
diff --git a/ScenariMicroservizio/src/utility/UserChangeSync.java b/ScenariMicroservizio/src/utility/UserChangeSync.java
index e6c7e70f441dc2486eb203f0a652996a27f5167d..e0592d4040ba041c93ab15eedab82aeee88aab69 100644
--- a/ScenariMicroservizio/src/utility/UserChangeSync.java
+++ b/ScenariMicroservizio/src/utility/UserChangeSync.java
@@ -39,7 +39,7 @@ public class UserChangeSync {
 		if(scenarioAttivo != null && scenarioAttivo.equals(scenNome)) {
 			//in questo caso sto disabilitando lo scenario attivo
 			esec.setLoopCondition(false);
-			esec.setScenarioAttivo(null);
+			esec.setScenarioAttivo(new File(esec.DB_FOLDER+"none"));
 		} else {
 			//attivo lo scenario scelto dall'utente
 			esec.setScenarioAttivo(scen);
diff --git a/webapp/public/js/scenari.js b/webapp/public/js/scenari.js
index 953f1bdb5958895bfb84d9de51f610d0d1e06f8c..7b3b6a540e0f01d3dbeb78f34c70a7e8e836565f 100644
--- a/webapp/public/js/scenari.js
+++ b/webapp/public/js/scenari.js
@@ -481,7 +481,7 @@ class Scenari {
      * @param {Boolean} activating true if the scenario should be activated, false otherwise
      */
     static toggleScenario(scenarioID, activating,fromServer = false) {
-        // HERE server deactivate the active scenario
+        // HERE ok server deactivate the active scenario
         console.log({scenarioID,activating,fromServer},Scenari.scenarioAttivoToggle);
         /*if(Scenari.scenarioAttivoToggle != null && !fromServer){
             const scenarioAttivoID = Scenari.scenarioAttivoToggle.id.substring(Scenari.scenarioAttivoToggle.id.indexOf('-') + 1);
@@ -491,7 +491,7 @@ class Scenari {
                 return;
         }*/
 
-        // HERE server toggle the scenario
+        // HERE ok server toggle the scenario
         const scenario = Scenari.scenariBucket.filter(sc => sc.id === scenarioID)[0];
         if(!fromServer){
             Scenari.setScenarioStatusServer(scenario, activating);
@@ -587,7 +587,7 @@ class Scenari {
      * @see Scenari.mostraNuovoScenario
      */
     static fillTable() {
-        // HERE server get all scenarios
+        // HERE ok server get all scenarios
         try {
             if(!Api.isConnected){
                 setTimeout(Scenari.fillTable, 2500);