diff --git a/Limelight/ViewControllers/StreamFrameViewController.m b/Limelight/ViewControllers/StreamFrameViewController.m
index f877874e..c12fbd04 100644
--- a/Limelight/ViewControllers/StreamFrameViewController.m
+++ b/Limelight/ViewControllers/StreamFrameViewController.m
@@ -164,6 +164,11 @@
         [_inactivityTimer invalidate];
     }
     
+#if TARGET_OS_TV
+    // Terminate the stream immediately on tvOS
+    Log(LOG_I, @"Terminating stream after resigning active");
+    [self returnToMainFrame];
+#else
     // Terminate the stream if the app is inactive for 10 seconds
     Log(LOG_I, @"Starting inactivity termination timer");
     _inactivityTimer = [NSTimer scheduledTimerWithTimeInterval:10
@@ -171,6 +176,7 @@
                                                     selector:@selector(inactiveTimerExpired:)
                                                     userInfo:nil
                                                      repeats:NO];
+#endif
 }
 
 - (void)inactiveTimerExpired:(NSTimer*)timer {