diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c92b7359..be9f41ea 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -95,8 +95,6 @@ add_library(colobotbase STATIC
     graphics/core/framebuffer.h
     graphics/core/light.h
     graphics/core/material.h
-    graphics/core/nulldevice.cpp
-    graphics/core/nulldevice.h
     graphics/core/texture.h
     graphics/core/type.cpp
     graphics/core/type.h
diff --git a/src/app/app.cpp b/src/app/app.cpp
index 1e4515ed..1b665224 100644
--- a/src/app/app.cpp
+++ b/src/app/app.cpp
@@ -39,8 +39,6 @@
 
 #include "common/thread/thread.h"
 
-#include "graphics/core/nulldevice.h"
-
 #include "graphics/opengl/glutil.h"
 
 #include "level/robotmain.h"
@@ -655,7 +653,7 @@ bool CApplication::Create()
         GetLogger()->Info("No joysticks detected\n");
     }
 
-    if (!m_headless)
+    //if (!m_headless)
     {
         std::string graphics = "default";
         std::string value;
@@ -679,10 +677,10 @@ bool CApplication::Create()
             m_device = Gfx::CreateDevice(m_deviceConfig, "opengl");
         }
     }
-    else
-    {
-        m_device = MakeUnique<Gfx::CNullDevice>();
-    }
+    //else
+    //{
+    //    m_device = MakeUnique<Gfx::CNullDevice>();
+    //}
 
     if (! m_device->Create() )
     {