diff --git a/app/src/interfaces/_system/system-field/system-field.vue b/app/src/interfaces/_system/system-field/system-field.vue
index 679bb49434..86a1b43aa5 100644
--- a/app/src/interfaces/_system/system-field/system-field.vue
+++ b/app/src/interfaces/_system/system-field/system-field.vue
@@ -12,7 +12,7 @@
 		:model-value="value"
 		:disabled="disabled"
 		:items="selectItems"
-		:placeholder="t('select_a_field')"
+		:placeholder="placeholder || t('select_a_field')"
 	/>
 </template>
 
diff --git a/app/src/panels/metric/index.ts b/app/src/panels/metric/index.ts
index 11f21d830b..c3e99c2a2b 100644
--- a/app/src/panels/metric/index.ts
+++ b/app/src/panels/metric/index.ts
@@ -94,6 +94,7 @@ export default definePanel({
 				options: {
 					collectionField: 'collection',
 					allowPrimaryKey: true,
+					placeholder: '$t:primary_key',
 				},
 				width: 'half',
 			},
diff --git a/app/src/panels/metric/metric.vue b/app/src/panels/metric/metric.vue
index 08b5426a47..2faadb9f05 100644
--- a/app/src/panels/metric/metric.vue
+++ b/app/src/panels/metric/metric.vue
@@ -72,7 +72,7 @@ export default defineComponent({
 		);
 
 		const displayValue = computed(() => {
-			if (!metric.value) return null;
+			if (metric.value === null || metric.value === undefined) return null;
 
 			if (props.options.abbreviate) {
 				return abbreviateNumber(metric.value, props.options.decimals);