diff --git a/Projects/UOContent/Gumps/Props/PropsGump.cs b/Projects/UOContent/Gumps/Props/PropsGump.cs
index 381f28176..8f7d31119 100644
--- a/Projects/UOContent/Gumps/Props/PropsGump.cs
+++ b/Projects/UOContent/Gumps/Props/PropsGump.cs
@@ -299,7 +299,8 @@ namespace Server.Gumps
                             return;
                         }
 
-                        var type = prop.PropertyType;
+                        var obj = prop.GetValue(m_Object, null);
+                        var type = obj?.GetType() ?? prop.PropertyType;
 
                         if (IsType(type, OfEntity))
                         {
@@ -392,8 +393,6 @@ namespace Server.Gumps
                         }
                         else if (HasAttribute(type, OfPropertyObject, true))
                         {
-                            var obj = prop.GetValue(m_Object, null);
-
                             from.SendGump(
                                 obj != null
                                     ? new PropertiesGump(from, obj, m_Stack, new StackEntry(m_Object, prop))