diff --git a/src/video/SDL_surface.c b/src/video/SDL_surface.c
index 9ae4f21586..104b7b9d5d 100644
--- a/src/video/SDL_surface.c
+++ b/src/video/SDL_surface.c
@@ -2014,7 +2014,7 @@ SDL_Surface *SDL_ConvertSurfaceAndColorspace(SDL_Surface *surface, SDL_PixelForm
         }
     }
 
-    if (surface->pixels) {
+    if (surface->pixels || SDL_MUSTLOCK(surface)) {
         result = SDL_BlitSurfaceUnchecked(surface, &bounds, convert, &bounds);
     } else {
         result = true;