diff --git a/gflib/sprite.c b/gflib/sprite.c
index c7e3d09a3..e36c53721 100644
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
@@ -1319,8 +1319,18 @@ void ApplyAffineAnimFrameRelativeAndUpdateMatrix(u8 matrixNum, struct AffineAnim
 
 s16 ConvertScaleParam(s16 scale)
 {
+    s16 ret;
     s32 val = 0x10000;
-    return val / scale;
+    // UB: possible division by zero
+#ifdef UBFIX
+    if (scale != 0)
+        ret = val / scale;
+    else
+        ret = 0;
+#else
+    ret = val / scale;
+#endif //UBFIX
+    return ret;
 }
 
 void GetAffineAnimFrame(u8 matrixNum, struct Sprite *sprite, struct AffineAnimFrameCmd *frameCmd)
diff --git a/src/pokedex.c b/src/pokedex.c
index 691abd649..6aa347994 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -3042,7 +3042,7 @@ static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite)
         if (gSineTable[sprite->data[5] + 64] != 0)
             var = 0x10000 / gSineTable[sprite->data[5] + 64];
         else
-            var = 0xFFFF;
+            var = 0;
 #else
         var = 0x10000 / gSineTable[sprite->data[5] + 64];
 #endif //UBFIX