diff --git a/source/net/filebot/Settings.java b/source/net/filebot/Settings.java
index 982f9570..77ac16f7 100644
--- a/source/net/filebot/Settings.java
+++ b/source/net/filebot/Settings.java
@@ -40,13 +40,10 @@ public final class Settings {
 
 	public static String getApiKey(String name) {
 		if (isAppStore()) {
-			try {
-				return getApplicationProperty("apikey.appstore." + name);
-			} catch (Exception e) {
-				// use default value
-			}
+			return getApplicationProperty("com.apikey." + name);
+		} else {
+			return getApplicationProperty("apikey." + name);
 		}
-		return getApplicationProperty("apikey." + name);
 	}
 
 	public static boolean isUnixFS() {
diff --git a/source/net/filebot/Settings.properties b/source/net/filebot/Settings.properties
index 03f0008c..d73641df 100644
--- a/source/net/filebot/Settings.properties
+++ b/source/net/filebot/Settings.properties
@@ -29,7 +29,7 @@ link.channel: https://www.filebot.net/channel.html
 link.help: https://www.filebot.net/support.html
 link.help.mas: https://www.filebot.net/mac/support.html
 
-# api keys for webservices
+# api keys
 apikey.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb
 apikey.thetvdb: 694FAD89942D3827
 apikey.themoviedb: 66308fb6e3fd850dde4c7d21df2e8306
@@ -38,11 +38,11 @@ apikey.acoustid: 0B3qZnQc
 apikey.anidb: filebot
 apikey.opensubtitles: FileBot
 
-# api keys used by the appstore distribution
-apikey.appstore.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb
-apikey.appstore.thetvdb: 5F6E873A88CF70D9
-apikey.appstore.themoviedb: 28bce8224bd3282a41bec4c5df528249
-apikey.appstore.omdb: 49d311ec
-apikey.appstore.acoustid: VCujaMw9
-apikey.appstore.anidb: filebotappstore
-apikey.appstore.opensubtitles: FileBot-AppStore
+# api keys
+com.apikey.fanart.tv: 780b986b22c35e6f7a134a2f392c2deb
+com.apikey.thetvdb: 5F6E873A88CF70D9
+com.apikey.themoviedb: 28bce8224bd3282a41bec4c5df528249
+com.apikey.omdb: 49d311ec
+com.apikey.acoustid: VCujaMw9
+com.apikey.anidb: filebotappstore
+com.apikey.opensubtitles: FileBot-AppStore