diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 482442cb53..9dabe2c733 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -141,7 +141,7 @@ long gui_wps_show(void)
             if (wps_state.paused) {
                 settings_save();
 #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
-                call_ata_idle_notifys(false);
+                call_ata_idle_notifys(true);
 #endif
             }
         }
@@ -255,7 +255,7 @@ long gui_wps_show(void)
                         audio_pause();
                     settings_save();
 #if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
-                    call_ata_idle_notifys(false);   /* make sure resume info is saved */
+                    call_ata_idle_notifys(true);   /* make sure resume info is saved */
 #endif
                 }
                 break;
diff --git a/apps/misc.c b/apps/misc.c
index 709bc49208..2f3251431b 100644
--- a/apps/misc.c
+++ b/apps/misc.c
@@ -555,7 +555,7 @@ bool settings_parseline(char* line, char** name, char** value)
 
 static void system_flush(void)
 {
-    call_ata_idle_notifys(false); /*doesnt work on usb and shutdown from ata thread */
+    call_ata_idle_notifys(true); /*doesnt work on usb and shutdown from ata thread */
     tree_flush();
 }
 
@@ -569,7 +569,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter)
 #ifdef SIMULATOR
     (void)callback;
     (void)parameter;
-    call_ata_idle_notifys(false);
+    call_ata_idle_notifys(true);
     exit(0);
 #else
     int i;
diff --git a/firmware/ata_idle_notify.c b/firmware/ata_idle_notify.c
index c51c3800ce..17adbc1192 100644
--- a/firmware/ata_idle_notify.c
+++ b/firmware/ata_idle_notify.c
@@ -20,7 +20,7 @@
 #include "system.h"
 #include "ata.h"
 #include "ata_idle_notify.h"
-#include "logf.h"
+#include "kernel.h"
 #include "string.h"
 
 #if USING_ATA_CALLBACK
@@ -28,10 +28,13 @@ static ata_idle_notify ata_idle_notify_funcs[MAX_ATA_CALLBACKS];
 static int ata_callback_count = 0;
 #endif
 
+
 bool register_ata_idle_func(ata_idle_notify function)
 {
 #if USING_ATA_CALLBACK
     int i;
+    if (ata_callback_count >= MAX_ATA_CALLBACKS)
+        return false;
     for (i=0; i<MAX_ATA_CALLBACKS; i++)
     {
         if (ata_idle_notify_funcs[i] == NULL)
@@ -69,13 +72,15 @@ void unregister_ata_idle_func(ata_idle_notify func, bool run)
     return;
 }
 
-bool call_ata_idle_notifys(bool sleep_after)
+bool call_ata_idle_notifys(bool force)
 {
     int i;
+    static int lock_until = 0;
     ata_idle_notify function;
-    if (ata_callback_count == 0)
+    if (!force && TIME_BEFORE(current_tick,lock_until) )
         return false;
-    ata_callback_count = 0; /* so we dont re-enter every time the callbacks read/write */
+    lock_until = current_tick + 30*HZ;
+
     for (i = 0; i < MAX_ATA_CALLBACKS; i++)
     {
         if (ata_idle_notify_funcs[i])
@@ -83,10 +88,9 @@ bool call_ata_idle_notifys(bool sleep_after)
             function = ata_idle_notify_funcs[i];
             ata_idle_notify_funcs[i] = NULL;
             function();
+            ata_callback_count--;
         }
     }
-    if (sleep_after)
-        ata_sleep();
     return true;
 }
 
diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c
index bb8eef9dd9..0de2eb1804 100644
--- a/firmware/drivers/ata.c
+++ b/firmware/drivers/ata.c
@@ -1285,7 +1285,7 @@ static void ata_thread(void)
                 break;
 #endif
             case Q_SLEEP:
-                call_ata_idle_notifys(true);
+                call_ata_idle_notifys(false);
                 last_disk_activity = current_tick - sleep_timeout + (HZ/2);
                 break;
                 
diff --git a/firmware/export/ata_idle_notify.h b/firmware/export/ata_idle_notify.h
index 65c181302a..ee825c967e 100644
--- a/firmware/export/ata_idle_notify.h
+++ b/firmware/export/ata_idle_notify.h
@@ -44,10 +44,10 @@ extern bool register_ata_idle_func(ata_idle_notify function);
 #if USING_ATA_CALLBACK
 extern void ata_idle_notify_init(void);
 extern void unregister_ata_idle_func(ata_idle_notify function, bool run);
-extern bool call_ata_idle_notifys(bool sleep_after);
+extern bool call_ata_idle_notifys(bool force);
 #else
 #define unregister_ata_idle_func(f,r)
-#define call_ata_idle_notifys(s)
+#define call_ata_idle_notifys(f)
 #define ata_idle_notify_init(s)
 #endif