diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
index 44c6364377d4f1cd6f1c9c50bd74bb0b89a1c150..d01abbbcfc8e2029da4dc999b899c16f507159b5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
@@ -192,7 +192,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				}
 			}
 			private function handleRemainingTimeUpdate(e:MeetingTimeRemainingEvent):void {
-				if (!timeRemaining.visible) {
+				// Display timer only if there is less than 30 minutes remaining
+				if (!timeRemaining.visible && e.timeLeftInSec <= 1800) {
 					timeRemaining.visible = true;
 				}
 				TimerUtil.setCountDownTimer(timeRemaining, e.timeLeftInSec);