diff --git a/client/iOS/Models/RDPSession.m b/client/iOS/Models/RDPSession.m
index 75e9c5ecf..adb45abf9 100644
--- a/client/iOS/Models/RDPSession.m
+++ b/client/iOS/Models/RDPSession.m
@@ -99,8 +99,12 @@ NSString* TSXSessionDidFailToConnectNotification = @"TSXSessionDidFailToConnect"
 		settings->ColorDepth = 32;
 		settings->LargePointerFlag = TRUE;
         settings->FrameMarkerCommandEnabled = TRUE;
+        settings->FrameAcknowledge = 10;
 	}
     
+    // enable NSCodec
+    settings->NSCodec = TRUE;
+
 	// Performance flags
     settings->DisableWallpaper = ![_params boolForKey:@"perf_show_desktop" with3GEnabled:connected_via_3g];
     settings->DisableFullWindowDrag = ![_params boolForKey:@"perf_window_dragging" with3GEnabled:connected_via_3g];
diff --git a/client/iOS/Views/RDPSessionView.m b/client/iOS/Views/RDPSessionView.m
index d36f315c1..6d0d0ac2b 100644
--- a/client/iOS/Views/RDPSessionView.m
+++ b/client/iOS/Views/RDPSessionView.m
@@ -24,7 +24,7 @@
 
 - (void)drawRect:(CGRect)rect 
 {
-	if(_session != nil)
+	if(_session != nil && [_session bitmapContext])
 	{
 		CGContextRef context = UIGraphicsGetCurrentContext();
 		CGImageRef cgImage = CGBitmapContextCreateImage([_session bitmapContext]);