diff --git a/src/SeeingSharp.Wpf/Multimedia/Views/SeeingSharpRendererElement.cs b/src/SeeingSharp.Wpf/Multimedia/Views/SeeingSharpRendererElement.cs
index 58f55af0..a5a91418 100644
--- a/src/SeeingSharp.Wpf/Multimedia/Views/SeeingSharpRendererElement.cs
+++ b/src/SeeingSharp.Wpf/Multimedia/Views/SeeingSharpRendererElement.cs
@@ -419,7 +419,7 @@ void IRenderLoopHost.OnRenderLoop_DisposeViewResources(EngineDevice engineDevice
                     RenderCapability.Tier >> 16 >= 2)
                 {
                     var handlerD3D9 = engineDevice.TryGetAdditionalDeviceHandler<DeviceHandlerD3D9>();
-                    if (handlerD3D9?.Device != null)
+                    if (handlerD3D9?.IsInitialized == true)
                     {
                         try
                         {
diff --git a/src/Tools/SeeingSharp.ModelViewer/_Controls/StatusBarControl.xaml b/src/Tools/SeeingSharp.ModelViewer/_Controls/StatusBarControl.xaml
index 00a4f07c..5536d96d 100644
--- a/src/Tools/SeeingSharp.ModelViewer/_Controls/StatusBarControl.xaml
+++ b/src/Tools/SeeingSharp.ModelViewer/_Controls/StatusBarControl.xaml
@@ -59,7 +59,7 @@
         <materialDesign:PackIcon Kind="ExpansionCard" />
         <TextBlock Text="Graphics Device:" />
         <ComboBox ItemsSource="{Binding ElementName=CtrlRoot, Path=CtrlRenderer.PossibleDevices}"
-                  SelectedItem="{Binding ElementName=CtrlRoot, Path=CtrlRenderer.SelectedDevice, Mode=TwoWay}"
+                  SelectedItem="{Binding ElementName=CtrlRoot, Path=CtrlRenderer.Device, Mode=TwoWay}"
                   VerticalAlignment="Center"
                   Width="200" />