diff --git a/frontend/apps/reader/modules/readeractivityindicator.lua b/frontend/apps/reader/modules/readeractivityindicator.lua
index 10d7a56b3..4e77c7084 100644
--- a/frontend/apps/reader/modules/readeractivityindicator.lua
+++ b/frontend/apps/reader/modules/readeractivityindicator.lua
@@ -2,10 +2,8 @@
 local ReaderActivityIndicator = {}
 
 function ReaderActivityIndicator:isStub() return true end
-function ReaderActivityIndicator:init() end
 function ReaderActivityIndicator:onStartActivityIndicator() end
 function ReaderActivityIndicator:onStopActivityIndicator() end
-function ReaderActivityIndicator:coda() end
 
 -- Now, if we're on Kindle, and we haven't actually murdered Pillow, see what we can do...
 local Device = require("device")
@@ -31,7 +29,9 @@ local EventListener = require("ui/widget/eventlistener")
 local util = require("ffi/util")
 -- lipc
 
-ReaderActivityIndicator = EventListener:new{}
+ReaderActivityIndicator = EventListener:extend{
+    lipc_handle = nil,
+}
 
 function ReaderActivityIndicator:isStub() return false end
 
@@ -69,15 +69,15 @@ function ReaderActivityIndicator:onStopActivityIndicator()
                 "clientId":"com.github.koreader.activityindicator", \
                 "priority":true}}')
         self.indicator_started = false
-        util.usleep(1000000)
     end
     return true
 end
 
-function ReaderActivityIndicator:coda()
+function ReaderActivityIndicator:onCloseWidget()
     if self.lipc_handle then
         self.lipc_handle:close()
     end
+    self.lipc_handle = nil
 end
 
 return ReaderActivityIndicator
diff --git a/reader.lua b/reader.lua
index 6347f9835..d62a2d70a 100755
--- a/reader.lua
+++ b/reader.lua
@@ -334,9 +334,6 @@ local function exitReader()
         end
     end
 
-    local ReaderActivityIndicator =
-        require("apps/reader/modules/readeractivityindicator")
-
     -- Save any device settings before closing G_reader_settings
     Device:saveSettings()
 
@@ -344,9 +341,6 @@ local function exitReader()
     G_reader_settings:saveSetting("closed_rotation_mode", Device.orig_rotation_mode or Device.screen:getRotationMode())
     G_reader_settings:close()
 
-    -- Close lipc handles
-    ReaderActivityIndicator:coda()
-
     -- Restore initial inversion state
     Device.screen:setHWNightmode(hw_nightmode)