diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 6a02bccd..801f1443 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -945,3 +945,11 @@ msgstr ""
 msgctxt "#33194"
 msgid "Manage libraries"
 msgstr ""
+
+msgctxt "#33195"
+msgid "Enable Emby for Kodi"
+msgstr ""
+
+msgctxt "#33196"
+msgid "Advanced options"
+msgstr ""
diff --git a/resources/settings.xml b/resources/settings.xml
index 639f6269..27853e48 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -92,12 +92,13 @@
 	<category label="30022"><!-- Advanced -->
 		<setting label="30004" id="logLevel" type="enum" values="Disabled|Info|Debug" default="1" />
 		<setting label="33164" id="maskInfo" type="bool" default="true" />
-		<setting label="30529" id="startupDelay" type="number" default="0" option="int" />
 		<setting label="30239" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=reset)" option="close" />
 		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" option="close" />
-		<setting label="33161" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=checkupdate)" option="close" />
+		<setting label="33196" type="lsep" />
+		<setting label="33195" id="enableAddon" type="bool" default="true" />
 		<setting label="33180" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=restartservice)" option="close" />
-		<setting type="sep" />
+		<setting label="30529" id="startupDelay" type="number" default="0" option="int" />
+		<setting label="33161" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=checkupdate)" option="close" />
 		<setting label="Developer mode" id="devMode" type="bool" default="false" />
 		
 		<setting type="sep" />
diff --git a/service.py b/service.py
index 8f6c7dd6..7075b105 100644
--- a/service.py
+++ b/service.py
@@ -78,6 +78,11 @@ if __name__ == "__main__":
 
     while True:
 
+        if not settings('enableAddon.bool'):
+            LOG.warn("Emby for Kodi is not enabled.")
+
+            break
+
         try:
             session = ServiceManager()
             session.start()