diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js b/resources/mmv/ui/mmv.ui.metadataPanel.js
index b04cbdfcb..25a3289a7 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -61,7 +61,12 @@
 
 	MPP.unattach = function() {
 		this.$title.tipsy( 'hide' );
-		this.$mmvOptOutLink.tipsy( 'hide' );
+
+		// This is created conditionally if MMV is in beta
+		if ( this.$mmvOptOutLink ) {
+			this.$mmvOptOutLink.tipsy( 'hide' );
+		}
+
 		this.$titleAndCredit.find( '.mw-mmv-author' ).tipsy( 'hide' );
 		this.$titleAndCredit.find( '.mw-mmv-source' ).tipsy( 'hide' );
 
diff --git a/resources/mmv/ui/mmv.ui.stripeButtons.js b/resources/mmv/ui/mmv.ui.stripeButtons.js
index 4a40ea0da..403f385a2 100644
--- a/resources/mmv/ui/mmv.ui.stripeButtons.js
+++ b/resources/mmv/ui/mmv.ui.stripeButtons.js
@@ -431,7 +431,10 @@
 		this.clearTimer( 'feedbackTooltip.show' );
 
 		$.each( this.buttons, function ( name, $button ) {
-			$button.tipsy( 'hide' );
+			// Tipsy's not enabled on every button
+			if ( $button.data( 'tipsy' ) ) {
+				$button.tipsy( 'hide' );
+			}
 		} );
 	};