diff --git a/src/components/Dashboard/common/SpotlightTooltip.jsx b/src/components/Dashboard/common/SpotlightTooltip.jsx
index a44a397..340f5e8 100644
--- a/src/components/Dashboard/common/SpotlightTooltip.jsx
+++ b/src/components/Dashboard/common/SpotlightTooltip.jsx
@@ -8,7 +8,10 @@ import ObjectProperty from './ObjectProperty'
 import InfoCircleIcon from '../../Icons/InfoCircleIcon'
 import { ApiServerContext } from '../context/ApiServerContext'
 import merge from 'lodash/merge'
-import { getModelByName } from '../../../database/ObjectModels'
+import {
+  getModelByName,
+  getModelProperty
+} from '../../../database/ObjectModels'
 
 const { Text } = Typography
 
@@ -128,7 +131,7 @@ const SpotlightTooltip = ({ query, type }) => {
                 return (
                   <Descriptions.Item key={prop.name} label={prop.label}>
                     <ObjectProperty
-                      type={prop.type}
+                      {...getModelProperty(type, prop.name)}
                       value={value}
                       objectData={spotlightData}
                       objectType={prop.objectType || type}