diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs
index 867a7187..3b15b4e0 100644
--- a/Vocaluxe/Lib/Draw/CDirect3D.cs
+++ b/Vocaluxe/Lib/Draw/CDirect3D.cs
@@ -186,10 +186,10 @@ namespace Vocaluxe.Lib.Draw
                 flags = CreateFlags.SoftwareVertexProcessing;
 
             //Check if Pow2 textures are needed
-            if ((caps.TextureCaps & TextureCaps.Pow2) != 0)
-                _NonPowerOf2TextureSupported = false;
-            else
-                _NonPowerOf2TextureSupported = true;
+            _NonPowerOf2TextureSupported = true;
+            _NonPowerOf2TextureSupported &= (caps.TextureCaps & TextureCaps.Pow2) != 0;
+            _NonPowerOf2TextureSupported &= (caps.TextureCaps & TextureCaps.NonPow2Conditional) != 0;
+            _NonPowerOf2TextureSupported &= (caps.TextureCaps & TextureCaps.SquareOnly) != 0;
 
             try
             {