diff --git a/forked-daapd.conf b/forked-daapd.conf
index b5133588..79b93583 100644
--- a/forked-daapd.conf
+++ b/forked-daapd.conf
@@ -91,6 +91,11 @@ library {
 	# forked-daapd will look for jpg and png files with these base names
 #	artwork_basenames = { "artwork", "cover", "Folder" }
 
+	# Disable searching for artwork corresponding to individual media file,
+	# and instead only look for album artwork. By default, individual artwork
+	# is enabled.
+#	ownartwork_disable = false
+
 	# File types the scanner should ignore
 	# Non-audio files will never be added to the database, but here you
 	# can prevent the scanner from even probing them. This might improve
diff --git a/src/artwork.c b/src/artwork.c
index 45e9d87f..527f79e4 100644
--- a/src/artwork.c
+++ b/src/artwork.c
@@ -1246,13 +1246,16 @@ artwork_get_item(int id, int max_w, int max_h, struct evbuffer *evbuf)
   if (!mfi)
     return -1;
 
-  /*
-   * Try the individual artwork first
-   */
-  ret = artwork_get_item_mfi(mfi, max_w, max_h, evbuf);
+  if (cfg_getbool(cfg_getsec(cfg, "library"), "ownartwork_disable"))
+    ret = -1;
+  else
+    /*
+     * Try the individual artwork first
+     */
+    ret = artwork_get_item_mfi(mfi, max_w, max_h, evbuf);
 
   /*
-   * No individual artwork, try group artwork
+   * No individual artwork or individual artwork disabled, try group artwork
    */
   if (ret < 0)
   {
diff --git a/src/conffile.c b/src/conffile.c
index e55a0b04..089d215d 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -76,6 +76,7 @@ static cfg_opt_t sec_library[] =
     CFG_STR("name_podcasts", "Podcasts", CFGF_NONE),
     CFG_STR("name_audiobooks", "Audiobooks", CFGF_NONE),
     CFG_STR_LIST("artwork_basenames", "{artwork,cover,Folder}", CFGF_NONE),
+    CFG_BOOL("ownartwork_disable", cfg_false, CFGF_NONE),
     CFG_STR_LIST("filetypes_ignore", "{.db,.ini,.db-journal,.pdf}", CFGF_NONE),
     CFG_BOOL("filescan_disable", cfg_false, CFGF_NONE),
     CFG_BOOL("itunes_overrides", cfg_false, CFGF_NONE),