diff --git a/Limelight/UIComputerView.m b/Limelight/UIComputerView.m
index be16e57..0e4036d 100644
--- a/Limelight/UIComputerView.m
+++ b/Limelight/UIComputerView.m
@@ -183,7 +183,11 @@ static const int LABEL_DY = 20;
 
 - (void) updateLoop {
     [self updateContentsForHost:_host];
-    [self performSelector:@selector(updateLoop) withObject:self afterDelay:REFRESH_CYCLE];
+    
+    // Stop updating when we detach from our parent view
+    if (self.superview != nil) {
+        [self performSelector:@selector(updateLoop) withObject:self afterDelay:REFRESH_CYCLE];
+    }
 }
 
 - (void) hostLongClicked:(UILongPressGestureRecognizer*)gesture {