diff --git a/src/components/admin/ParkForm.tsx b/src/components/admin/ParkForm.tsx
index eb40dff2..6a03f84e 100644
--- a/src/components/admin/ParkForm.tsx
+++ b/src/components/admin/ParkForm.tsx
@@ -1,7 +1,8 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import * as z from 'zod';
+import { validateSubmissionHandler } from '@/lib/entityFormValidation';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';
@@ -100,6 +101,11 @@ const statusOptions = [
 export function ParkForm({ onSubmit, onCancel, initialData, isEditing = false }: ParkFormProps) {
   const { isModerator } = useUserRole();
   const [submitting, setSubmitting] = useState(false);
+
+  // Validate that onSubmit uses submission helpers (dev mode only)
+  useEffect(() => {
+    validateSubmissionHandler(onSubmit, 'park');
+  }, [onSubmit]);
   
   // Operator state
   const [selectedOperatorId, setSelectedOperatorId] = useState<string>(initialData?.operator_id || '');
diff --git a/src/components/admin/RideForm.tsx b/src/components/admin/RideForm.tsx
index 2b2431b5..f465fbb1 100644
--- a/src/components/admin/RideForm.tsx
+++ b/src/components/admin/RideForm.tsx
@@ -1,7 +1,8 @@
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
 import { zodResolver } from '@hookform/resolvers/zod';
 import * as z from 'zod';
+import { validateSubmissionHandler } from '@/lib/entityFormValidation';
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
 import { Button } from '@/components/ui/button';
 import { Input } from '@/components/ui/input';