diff --git a/src/agent/npc/controller.js b/src/agent/npc/controller.js
index 84770cd..d65107c 100644
--- a/src/agent/npc/controller.js
+++ b/src/agent/npc/controller.js
@@ -80,12 +80,15 @@ export class NPCContoller {
     }
 
     async setGoal(name=null, quantity=1) {
+        this.data.curr_goal = null;
         this.last_goals = {};
         if (name) {
             this.data.curr_goal = {name: name, quantity: quantity};
             return;
         }
-        
+
+        if (!this.data.do_set_goal) return;
+
         let past_goals = {...this.last_goals};
         for (let goal in this.data.goals) {
             if (past_goals[goal.name] === undefined) past_goals[goal.name] = true;
diff --git a/src/agent/npc/data.js b/src/agent/npc/data.js
index 6d12f0a..b5de0eb 100644
--- a/src/agent/npc/data.js
+++ b/src/agent/npc/data.js
@@ -4,8 +4,8 @@ export class NPCData {
         this.curr_goal = null;
         this.built = {};
         this.home = null;
-        this.do_routine = true;
-        this.do_set_goal = true;
+        this.do_routine = false;
+        this.do_set_goal = false;
     }
 
     toObject() {