diff --git a/lib/gfx/texture.hpp b/lib/gfx/texture.hpp
index 644d08c..fd81a5a 100644
--- a/lib/gfx/texture.hpp
+++ b/lib/gfx/texture.hpp
@@ -59,7 +59,7 @@ void write_texture(TextureRef& ref, ArrayRef<uint8_t> data) noexcept;
 struct GXTexObj_ {
   u32 mode0 = 0;
   u32 mode1 = 0;
-  u32 image0 = 0;
+  u32 image0 = UINT32_MAX;
   u32 image3 = 0;
   const void* userData = nullptr;
   const void* data = nullptr;
@@ -73,11 +73,8 @@ struct GXTexObj_ {
 
   static constexpr u32 get_bits(u32 reg, u32 size, u32 shift) noexcept { return (reg >> shift) & ((1u << size) - 1); }
 
-  // Don't fall back to raw_width/raw_height: when the object is zeroed, they will return 1 instead of 0
-  u32 width() const noexcept { return mWidth; }
-  u32 raw_width() const noexcept { return get_bits(image0, 10, 0) + 1; }
-  u32 height() const noexcept { return mHeight; }
-  u32 raw_height() const noexcept { return get_bits(image0, 10, 10) + 1; }
+  u32 width() const noexcept { return mWidth != 0 ? mWidth : get_bits(image0, 10, 0) + 1 & 0x3FF; }
+  u32 height() const noexcept { return mHeight != 0 ? mHeight : get_bits(image0, 10, 10) + 1 & 0x3FF; }
   u32 raw_format() const noexcept { return get_bits(image0, 4, 20); }
   u32 format() const noexcept { return mFormat != aurora::gfx::InvalidTextureFormat ? mFormat : raw_format(); }
   GXTexWrapMode wrap_s() const noexcept { return static_cast<GXTexWrapMode>(get_bits(mode0, 2, 0)); }
diff --git a/tests/gx_fifo_test.cpp b/tests/gx_fifo_test.cpp
index 258f17f..a4488db 100644
--- a/tests/gx_fifo_test.cpp
+++ b/tests/gx_fifo_test.cpp
@@ -1304,6 +1304,26 @@ TEST_F(GXFifoTest, LoadTexObjPcFormat_PreservesFullFormatMetadata) {
   EXPECT_EQ(slot.raw_format(), static_cast<u32>(GX_TF_RGBA8));
 }
 
+TEST_F(GXFifoTest, TexObjRawDimensions_WrapAtTenBitBoundary) {
+  auto& slot = gxState().loadedTextures[GX_TEXMAP0];
+  slot.image0 = (0x3FFu << 0) | (0x3FFu << 10);
+  slot.mWidth = 0;
+  slot.mHeight = 0;
+
+  EXPECT_EQ(slot.width(), 0u);
+  EXPECT_EQ(slot.height(), 0u);
+}
+
+TEST_F(GXFifoTest, TexObjExplicitDimensions_DoNotWrapAtTenBitBoundary) {
+  auto& slot = gxState().loadedTextures[GX_TEXMAP0];
+  slot.image0 = (0x3FFu << 0) | (0x3FFu << 10);
+  slot.mWidth = 1024;
+  slot.mHeight = 1024;
+
+  EXPECT_EQ(slot.width(), 1024u);
+  EXPECT_EQ(slot.height(), 1024u);
+}
+
 TEST_F(GXFifoTest, LoadTexObjCiAndTlut_PopulatesTextureAndTlutSlots) {
   alignas(32) u8 image[64]{};
   alignas(32) u16 palette[16]{};