diff --git a/_config/Oembed.yml b/_config/Oembed.yml
index 41226d09bcb..cbea56f9d11 100644
--- a/_config/Oembed.yml
+++ b/_config/Oembed.yml
@@ -20,3 +20,5 @@ Oembed:
       'https://api.twitter.com/1/statuses/oembed.json'
   autodiscover:
     true
+  enabled:
+    true
\ No newline at end of file
diff --git a/oembed/Oembed.php b/oembed/Oembed.php
index f07fe53a474..7017a3d24af 100644
--- a/oembed/Oembed.php
+++ b/oembed/Oembed.php
@@ -13,6 +13,11 @@
  */
 
 class Oembed {
+
+	public static function is_enabled() {
+		return Config::inst()->get('Oembed', 'enabled');
+	}
+
 	/**
 	 * Gets the autodiscover setting from the config.
 	 */
@@ -111,6 +116,8 @@ protected static function autodiscover_from_url($url) {
 	 * @returns Oembed_Result/bool An Oembed descriptor, or false
 	 */
 	public static function get_oembed_from_url($url, $type = false, array $options = array()) {
+		if(!self::is_enabled()) return false;
+
 		// Find or build the Oembed URL.
 		$endpoint = self::find_endpoint($url);
 		$oembedUrl = false;