diff --git a/frontend/ui/readerui.lua b/frontend/ui/readerui.lua
index 877ccb200..171283245 100644
--- a/frontend/ui/readerui.lua
+++ b/frontend/ui/readerui.lua
@@ -108,13 +108,12 @@ function ReaderUI:init()
 	}
 	table.insert(self, highlight)
 	-- goto
-	local goto = ReaderGoto:new{
+	table.insert(self, ReaderGoto:new{
 		dialog = self.dialog,
 		view = self[1],
 		ui = self,
 		document = self.document,
-	}
-	table.insert(self, goto)
+	})
 	-- dictionary
 	local dict = ReaderDictionary:new{
 		dialog = self.dialog,
@@ -130,13 +129,14 @@ function ReaderUI:init()
 		ui = self
 	}
 	table.insert(self.active_widgets, reader_ss)
-	-- frontlight controller
-	local reader_fl = ReaderFrontLight:new{
-		dialog = self.dialog,
-		view = self[1],
-		ui = self
-	}
-	table.insert(self, reader_fl)
+	if Device:getFrontlight() then
+		-- frontlight controller
+		table.insert(self, ReaderFrontLight:new{
+			dialog = self.dialog,
+			view = self[1],
+			ui = self
+		})
+	end
 
 	if self.document.info.has_pages then
 		-- for page specific controller
diff --git a/reader.lua b/reader.lua
index 429d17f06..469476e1f 100755
--- a/reader.lua
+++ b/reader.lua
@@ -156,7 +156,7 @@ local last_file = G_reader_settings:readSetting("lastfile")
 
 do
 	local fl = Device:getFrontlight()
-	if fl.restore_settings then
+	if fl and fl.restore_settings then
 		local intensity = G_reader_settings:readSetting("frontlight_intensity")
 		intensity = intensity or fl.intensity
 		fl:setIntensity(intensity)