diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 1e891291..786a9b3b 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -1598,6 +1598,7 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 
 	workflow.Actions = newActions
 
+	newTriggers := []Trigger{}
 	for _, trigger := range workflow.Triggers {
 		log.Printf("Trigger %s: %s", trigger.TriggerType, trigger.Status)
 
@@ -1610,12 +1611,23 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 			} else if schedule.Id == "" {
 				trigger.Status = "stopped"
 			}
+		} else if trigger.TriggerType == "WEBHOOK" && trigger.Status != "uninitialized" {
+			hook, err := getHook(ctx, trigger.ID)
+			if err != nil {
+				log.Printf("Failed getting webhook")
+				trigger.Status = "stopped"
+			} else if hook.Id == "" {
+				trigger.Status = "stopped"
+			}
 		}
 
 		//log.Println("TRIGGERS")
 		allNodes = append(allNodes, trigger.ID)
+		newTriggers = append(newTriggers, trigger)
 	}
 
+	workflow.Triggers = newTriggers
+
 	for _, variable := range workflow.WorkflowVariables {
 		if len(variable.Value) == 0 {
 			log.Printf("Can't have an empty variable: %s", variable.Name)
diff --git a/docker-compose.yml b/docker-compose.yml
index a8097114..02efa84a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     depends_on:
       - backend
   backend:
-    build: ./backend
+    #build: ./backend
     image: frikky/shuffle:backend
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}