diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 41805b17..0cc0290f 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -13,12 +13,6 @@
 
 
 
-
-todo: timeout for reporting should be used for all areas where a timeout is specified for puppeteer sharp so that everything is in agreement
-	or, maybe what is required is to set them unusually high to allow for mega reports adn let the zombie reaper handle based on user settings!!!
-	because we don't want a 30 second limit in puppeteer to kill a report when they set it to be 2 minutes timeout because they know they have a huge report to print from time to time
-	
-
 todo: add code for client reporting to handle a busy response
 	perhaps it retries after the delay a fixed number of times then reports back a fail / retry later to the user
 	joyce suggested a folksy message regarding server busy, something friendly and non techy sounding
diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue
index f9030d75..fd4046cf 100644
--- a/ayanova/src/components/report-selector-control.vue
+++ b/ayanova/src/components/report-selector-control.vue
@@ -106,6 +106,16 @@ export default {
         reportDataOptions
       );
       this.rendering = false;
+
+      if (res.data && res.data.busy) {
+        window.$gz.eventBus.$emit(
+          "notify-warning",
+          "Dammit captain, I'm giving it all she's got, try again later"
+        );
+        this.resolve(null);
+        this.isVisible = false;
+        return;
+      }
       if (res.error) {
         this.reject(res);
       } else {