diff --git a/src/rcore_desktop.c b/src/rcore_desktop.c
index 81da488e3..fe5a02aac 100644
--- a/src/rcore_desktop.c
+++ b/src/rcore_desktop.c
@@ -1657,6 +1657,8 @@ static int InitPlatform(void)
     rlLoadExtensions(glfwGetProcAddress);
 
     if ((CORE.Window.flags & FLAG_WINDOW_MINIMIZED) > 0) MinimizeWindow();
+
+    CORE.Window.ready = true;   // TODO: Proper validation on windows/context creation
     
     // If graphic device is no properly initialized, we end program
     if (!CORE.Window.ready) { TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphic device"); return -1; }
diff --git a/src/rcore_drm.c b/src/rcore_drm.c
index 213f2c546..8f1bfa429 100644
--- a/src/rcore_drm.c
+++ b/src/rcore_drm.c
@@ -1035,6 +1035,8 @@ static int InitPlatform(void)
 
     if ((CORE.Window.flags & FLAG_WINDOW_MINIMIZED) > 0) MinimizeWindow();
     
+    CORE.Window.ready = true;   // TODO: Proper validation on windows/context creation
+    
         // If graphic device is no properly initialized, we end program
     if (!CORE.Window.ready) { TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphic device"); return -1; }
     else SetWindowPosition(GetMonitorWidth(GetCurrentMonitor()) / 2 - CORE.Window.screen.width / 2, GetMonitorHeight(GetCurrentMonitor()) / 2 - CORE.Window.screen.height / 2);
diff --git a/src/rcore_web.c b/src/rcore_web.c
index 3b9373bbf..15c7626dd 100644
--- a/src/rcore_web.c
+++ b/src/rcore_web.c
@@ -1002,6 +1002,8 @@ static int InitPlatform(void)
     TRACELOG(LOG_INFO, "    > Render size:  %i x %i", CORE.Window.render.width, CORE.Window.render.height);
     TRACELOG(LOG_INFO, "    > Viewport offsets: %i, %i", CORE.Window.renderOffset.x, CORE.Window.renderOffset.y);
     
+    CORE.Window.ready = true;   // TODO: Proper validation on windows/context creation
+    
     // If graphic device is no properly initialized, we end program
     if (!CORE.Window.ready) { TRACELOG(LOG_FATAL, "PLATFORM: Failed to initialize graphic device"); return -1; }
     else SetWindowPosition(GetMonitorWidth(GetCurrentMonitor())/2 - CORE.Window.screen.width/2, GetMonitorHeight(GetCurrentMonitor())/2 - CORE.Window.screen.height/2);