diff --git a/beetsplug/embyupdate.py b/beetsplug/embyupdate.py
index 3af285973..6f74b4452 100644
--- a/beetsplug/embyupdate.py
+++ b/beetsplug/embyupdate.py
@@ -6,6 +6,7 @@
         host: localhost
         port: 8096
         username: user
+        apikey: apikey
         password: password
 """
 from __future__ import division, absolute_import, print_function
@@ -150,7 +151,9 @@ class EmbyUpdate(BeetsPlugin):
         # Adding defaults.
         config['emby'].add({
             u'host': u'http://localhost',
-            u'port': 8096
+            u'port': 8096,
+            u'apikey': None,
+            u'password': None
         })
 
         self.register_listener('database_change', self.listen_for_db_change)
@@ -171,6 +174,11 @@ class EmbyUpdate(BeetsPlugin):
         password = config['emby']['password'].get()
         token = config['emby']['apikey'].get()
 
+        # Check if at least a apikey or password is given.
+        if not any([password, token]):
+            self._log.warning(u'Provide at least Emby password or apikey.')
+            return
+
         # Get user information from the Emby API.
         user = get_user(host, port, username)
         if not user:
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 102154bbc..5a3451017 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -44,6 +44,7 @@ Fixes:
   :bug:`2302`
 * :doc:`/plugins/lyrics`: The plugin now reports a beets-specific User-Agent
   header when requesting lyrics. :bug:`2357`
+* :doc:`/plugins/embyupdate`: Fix a bug that apikey and password is needed in config.
 
 For plugin developers: new importer prompt choices (see :ref:`append_prompt_choices`), you can now provide new candidates for the user to consider.