diff --git a/oembed/Oembed.php b/oembed/Oembed.php
index 66fe2adbb..e598b4a59 100644
--- a/oembed/Oembed.php
+++ b/oembed/Oembed.php
@@ -311,9 +311,9 @@ class Oembed_Result extends ViewableData {
 		case 'video':
 		case 'rich':
 			if($this->extraClass) {
-				return "<div class='$this->extraClass'>$this->HTML</div>";
+				return "<div class='media $this->extraClass'>$this->HTML</div>";
 			} else {
-				return $this->HTML;
+				return "<div class='media'>$this->HTML</div>";
 			}
 			break;
 		case 'link':