diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
index dac42c9..f21d3fc 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/MainActivity.kt
@@ -127,7 +127,9 @@ class MainActivity : SimpleActivity() {
 
     private fun setupCameraImpl() {
         mCameraImpl = MyCameraImpl.newInstance(this)
-        mCameraImpl!!.enableFlashlight()
+        if (config.turnFlashlightOn) {
+            mCameraImpl!!.enableFlashlight()
+        }
     }
 
     private fun setupStroboscope() {
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
index e29b8d5..6d6509b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/activities/SettingsActivity.kt
@@ -20,6 +20,7 @@ class SettingsActivity : SimpleActivity() {
 
         setupCustomizeColors()
         setupUseEnglish()
+        setupTurnFlashlightOn()
         setupBrightDisplay()
         setupStroboscope()
         updateTextColors(settings_holder)
@@ -41,6 +42,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupTurnFlashlightOn() {
+        settings_turn_flashlight_on.isChecked = config.turnFlashlightOn
+        settings_turn_flashlight_on_holder.setOnClickListener {
+            settings_turn_flashlight_on.toggle()
+            config.turnFlashlightOn = settings_turn_flashlight_on.isChecked
+        }
+    }
+
     private fun setupBrightDisplay() {
         settings_bright_display.isChecked = config.brightDisplay
         settings_bright_display_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
index 1708dac..6667e84 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Config.kt
@@ -15,4 +15,8 @@ class Config(context: Context) : BaseConfig(context) {
     var stroboscope: Boolean
         get() = prefs.getBoolean(STROBOSCOPE, true)
         set(stroboscope) = prefs.edit().putBoolean(STROBOSCOPE, stroboscope).apply()
+
+    var turnFlashlightOn: Boolean
+        get() = prefs.getBoolean(TURN_FLASHLIGHT_ON, false)
+        set(turnFlashlightOn) = prefs.edit().putBoolean(TURN_FLASHLIGHT_ON, turnFlashlightOn).apply()
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Constants.kt
index 2304755..5a98abd 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/Constants.kt
@@ -1,7 +1,8 @@
 package com.simplemobiletools.flashlight.helpers
 
-val BRIGHT_DISPLAY = "bright_display"
-val STROBOSCOPE = "stroboscope"
-val IS_ENABLED = "is_enabled"
-val TOGGLE = "toggle"
-val TOGGLE_WIDGET_UI = "toggle_widget_ui"
+const val BRIGHT_DISPLAY = "bright_display"
+const val STROBOSCOPE = "stroboscope"
+const val TURN_FLASHLIGHT_ON = "turn_flashlight_on"
+const val IS_ENABLED = "is_enabled"
+const val TOGGLE = "toggle"
+const val TOGGLE_WIDGET_UI = "toggle_widget_ui"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index e7c439c..9d63951 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -50,6 +50,26 @@
 
         </RelativeLayout>
 
+        <RelativeLayout
+            android:id="@+id/settings_turn_flashlight_on_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_turn_flashlight_on"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/turn_flashlight_on"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_bright_display_holder"
             android:layout_width="match_parent"