diff --git a/src/gpu/SDL_gpu.c b/src/gpu/SDL_gpu.c
index 5642f65b8d..8d66b1531b 100644
--- a/src/gpu/SDL_gpu.c
+++ b/src/gpu/SDL_gpu.c
@@ -62,7 +62,7 @@
     }
 
 #if 0
-// The below validation is too aggressive, since there are advanced situations 
+// The below validation is too aggressive, since there are advanced situations
 // where this is legal. This is being temporarily disabled for further review.
 // See: https://github.com/libsdl-org/SDL/issues/13871
 #define CHECK_SAMPLER_TEXTURES                                                                                                          \
@@ -1340,6 +1340,12 @@ SDL_GPUBuffer *SDL_CreateGPUBuffer(
         return NULL;
     }
 
+    if (device->debug_mode) {
+        if (createinfo->size < 4) {
+            SDL_assert_release(!"Cannot create a buffer with size less than 4 bytes!");
+        }
+    }
+
     const char *debugName = SDL_GetStringProperty(createinfo->props, SDL_PROP_GPU_BUFFER_CREATE_NAME_STRING, NULL);
 
     return device->CreateBuffer(