diff --git a/main.go b/main.go
index 4ce58bb..beb840f 100644
--- a/main.go
+++ b/main.go
@@ -157,6 +157,11 @@ func (mmsd *mmsdService) v1Instances(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if len(app.Tasks) == 0 {
+		w.WriteHeader(http.StatusNoContent)
+		return
+	}
+
 	// appJson, err := json.MarshalIndent(app, "", " ")
 	// w.Write(appJson)
 	// fmt.Fprintf(w, "\n")