diff --git a/util/test/demos/dx/d3d_helpers.cpp b/util/test/demos/dx/d3d_helpers.cpp
index e7cb43b84..9da0dfb9a 100644
--- a/util/test/demos/dx/d3d_helpers.cpp
+++ b/util/test/demos/dx/d3d_helpers.cpp
@@ -131,7 +131,8 @@ IDXGIAdapterPtr ChooseD3DAdapter(IDXGIFactoryPtr factory, int argc, char **argv,
 
       if(needle == "warp")
       {
-        adapter = warp;
+        warp = true;
+        adapter = NULL;
         break;
       }