diff --git a/source/net/filebot/media/ImageMetadata.java b/source/net/filebot/media/ImageMetadata.java
index 01d292b3..a61750a0 100644
--- a/source/net/filebot/media/ImageMetadata.java
+++ b/source/net/filebot/media/ImageMetadata.java
@@ -141,7 +141,7 @@ public class ImageMetadata {
 	}
 
 	protected String getGeocodeKey() {
-		return Optional.ofNullable(System.getenv("GEOCODE_APIKEY")).orElse(getApiKey("google.geocode"));
+		return System.getProperty("cloud.google.geocode", getApiKey("google.geocode"));
 	}
 
 	public enum AddressComponent {