diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index f031fb5f1e..5bfc346d88 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -176,6 +176,11 @@ namespace BizHawk.MultiClient
                 MessageFont.Dispose();
                 MessageFont = null;
             }
+            if (Device != null)
+            {
+                Device.Dispose();
+                Device = null;
+            }
         }
 
         public void CreateDevice()