diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d08d71d..35bc6ad5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ option(USE_GPIOD "Use GPIOD" OFF)
 # Use DBUS to control the emulator?
 option(USE_DBUS "Use DBus" OFF)
 # Use OpenGL for rendering? NOTE: Not yet implemented
-option(USE_OPENGL "Use OpenGL (currently BROKEN)" OFF)
+option(USE_OPENGL "Use OpenGL" OFF)
 # Enable Link Time Optimization?
 option(WITH_LTO "Enable Link Time Optimization" OFF)
 
diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp
index 6c820348..b476ef5e 100644
--- a/src/osdep/amiberry_gfx.cpp
+++ b/src/osdep/amiberry_gfx.cpp
@@ -301,7 +301,9 @@ static void SDL2_init()
 			mode |= SDL_WINDOW_SHOWN;
 		// Set Window allow high DPI by default
 		mode |= SDL_WINDOW_ALLOW_HIGHDPI;
+#ifdef USE_OPENGL
 		mode |= SDL_WINDOW_OPENGL;
+#endif
 
 		if (amiberry_options.rotation_angle == 0 || amiberry_options.rotation_angle == 180)
 		{
diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp
index 3d7b313f..1343116f 100644
--- a/src/osdep/gui/main_window.cpp
+++ b/src/osdep/gui/main_window.cpp
@@ -310,7 +310,6 @@ void amiberry_gui_init()
             mode |= SDL_WINDOW_SHOWN;
 		// Set Window allow high DPI by default
 		mode |= SDL_WINDOW_ALLOW_HIGHDPI;
-		mode |= SDL_WINDOW_OPENGL;
 
         if (amiberry_options.rotation_angle == 0 || amiberry_options.rotation_angle == 180)
         {