diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m
index ef264a7..577dbc8 100644
--- a/Limelight/ViewControllers/StreamFrameViewController.m
+++ b/Limelight/ViewControllers/StreamFrameViewController.m
@@ -75,9 +75,9 @@
 - (void) connectionStarted {
     Log(LOG_I, @"Connection started");
     dispatch_async(dispatch_get_main_queue(), ^{
-        [self.spinner stopAnimating];
-        [self.stageLabel setText:@"Waiting for first frame..."];
-        [self.stageLabel sizeToFit];
+        // Leave the spinner spinning until it's obscured by
+        // the first frame of video.
+        self.stageLabel.hidden = YES;
         [(StreamView*)self.view setupOnScreenControls: self->_controllerSupport swipeDelegate:self];
     });
 }