diff --git a/indra/newview/llmediaremotectrl.cpp b/indra/newview/llmediaremotectrl.cpp
index c044496dc..e4055c567 100644
--- a/indra/newview/llmediaremotectrl.cpp
+++ b/indra/newview/llmediaremotectrl.cpp
@@ -192,7 +192,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 
 			play_media_enabled = true;
 			media_icon_color = LLUI::sColorsGroup->getColor( "IconEnabledColor" );
-
+			/* <HACK: Temporary fix until I know how to correctly catch messages from CEF. - Router Gray>
 			LLViewerMediaImpl::EMediaStatus status = LLViewerParcelMedia::getStatus();
 			switch(status)
 			{
@@ -216,6 +216,18 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 				// inherit defaults above
 				break;
 			}
+			*/
+			if (LLViewerMedia::isParcelMediaPlaying())
+			{
+				stop_media_enabled = true;
+				play_media_enabled = false;
+			}
+			else
+			{
+				stop_media_enabled = false;
+				play_media_enabled = true;
+			}
+			// </HACK - Router Gray>
 		}
 	}