diff --git a/src/game/paintings.c b/src/game/paintings.c
index 0c0b9d77..c55dac83 100644
--- a/src/game/paintings.c
+++ b/src/game/paintings.c
@@ -872,6 +872,7 @@ void painting_update_floors(struct Painting *painting) {
         enterRight = 0;
         struct Surface* surface;
         find_floor(m->marioObj->oPosX, m->marioObj->oPosY, m->marioObj->oPosZ, &surface);
+        if (surface == NULL) { continue; }
         s16 floorType = surface->type;
 
         /* The area in front of every painting in the game (except HMC and CotMC, which   *\