diff --git a/client/iOS/FreeRDP/ios_freerdp.m b/client/iOS/FreeRDP/ios_freerdp.m
index ae3f1e084..ee0cdddc0 100644
--- a/client/iOS/FreeRDP/ios_freerdp.m
+++ b/client/iOS/FreeRDP/ios_freerdp.m
@@ -221,7 +221,9 @@ ios_run_freerdp(freerdp * instance)
 
 		[pool release]; pool = nil;
 	}	
-	
+
+	CGContextRelease(mfi->bitmap_context);
+	mfi->bitmap_context = NULL;	
 	mfi->connection_state = TSXConnectionDisconnected;
 	
 	// Cleanup
diff --git a/client/iOS/Models/RDPSession.m b/client/iOS/Models/RDPSession.m
index 87a1aafc6..6144637d1 100644
--- a/client/iOS/Models/RDPSession.m
+++ b/client/iOS/Models/RDPSession.m
@@ -190,9 +190,7 @@ NSString* TSXSessionDidFailToConnectNotification = @"TSXSessionDidFailToConnect"
 
 - (CGContextRef)bitmapContext
 {
-    if ([self mfi]->connection_state == TSXConnectionConnected)
-        return [self mfi]->bitmap_context;
-    return NULL;
+    return [self mfi]->bitmap_context;
 }
 
 #pragma mark -