diff --git a/src/game/prop.c b/src/game/prop.c
index 786a64db1..92505fa3a 100644
--- a/src/game/prop.c
+++ b/src/game/prop.c
@@ -1170,7 +1170,11 @@ void handInflictMeleeDamage(s32 handnum, struct gset *gset, bool arg2)
 			bool isglass = false;
 
 			if (obj && gset->weaponnum != WEAPON_TRANQUILIZER) {
-				isglass = obj->type == OBJTYPE_GLASS || obj->type == OBJTYPE_TINTEDGLASS;
+				isglass =
+#ifdef AVOID_UB
+					(prop->type == PROPTYPE_OBJ) &&
+#endif
+					(obj->type == OBJTYPE_GLASS || obj->type == OBJTYPE_TINTEDGLASS);
 			}
 
 			if (arg2) {