diff --git a/src/lib/entityValidationSchemas.ts b/src/lib/entityValidationSchemas.ts
index a0431f12..5b04a079 100644
--- a/src/lib/entityValidationSchemas.ts
+++ b/src/lib/entityValidationSchemas.ts
@@ -602,23 +602,39 @@ export async function validateEntityData(
       try {
         switch (tableName) {
           case 'parks': {
-            const { data } = await supabase.from('parks').select('slug').eq('id', entityId).single();
-            originalSlug = data?.slug || null;
+            const { data, error } = await supabase.from('parks').select('slug').eq('id', entityId).maybeSingle();
+            if (error || !data) {
+              originalSlug = null;
+              break;
+            }
+            originalSlug = data.slug || null;
             break;
           }
           case 'rides': {
-            const { data } = await supabase.from('rides').select('slug').eq('id', entityId).single();
-            originalSlug = data?.slug || null;
+            const { data, error } = await supabase.from('rides').select('slug').eq('id', entityId).maybeSingle();
+            if (error || !data) {
+              originalSlug = null;
+              break;
+            }
+            originalSlug = data.slug || null;
             break;
           }
           case 'companies': {
-            const { data } = await supabase.from('companies').select('slug').eq('id', entityId).single();
-            originalSlug = data?.slug || null;
+            const { data, error } = await supabase.from('companies').select('slug').eq('id', entityId).maybeSingle();
+            if (error || !data) {
+              originalSlug = null;
+              break;
+            }
+            originalSlug = data.slug || null;
             break;
           }
           case 'ride_models': {
-            const { data } = await supabase.from('ride_models').select('slug').eq('id', entityId).single();
-            originalSlug = data?.slug || null;
+            const { data, error } = await supabase.from('ride_models').select('slug').eq('id', entityId).maybeSingle();
+            if (error || !data) {
+              originalSlug = null;
+              break;
+            }
+            originalSlug = data.slug || null;
             break;
           }
         }