diff --git a/frontend/device/kindle/device.lua b/frontend/device/kindle/device.lua
index 8d9f7c7f0..f54f94a2a 100644
--- a/frontend/device/kindle/device.lua
+++ b/frontend/device/kindle/device.lua
@@ -84,7 +84,7 @@ local function isWifiUp()
     local out = file:read("*number")
     file:close()
 
-    return out == 1
+    return true, out == 1
 end
 
 --[[
diff --git a/frontend/ui/network/manager.lua b/frontend/ui/network/manager.lua
index 3c87f6cb6..786ebd824 100644
--- a/frontend/ui/network/manager.lua
+++ b/frontend/ui/network/manager.lua
@@ -248,6 +248,9 @@ end
 function NetworkMgr:isConnected()
     if Device:isAndroid() or Device:isCervantes() or Device:isPocketBook() or Device:isEmulator() then
         return self:isWifiOn()
+    elseif Device:isKindle() then
+        local on, connected =  self:isWifiOn()
+        return on and connected
     else
         -- Pull the default gateway first, so we don't even try to ping anything if there isn't one...
         local default_gw