diff --git a/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts b/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
index 2a9daa6b..16208a1a 100644
--- a/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
+++ b/packages/app-elements/src/ui/forms/CodeEditor/fetchCoreResourcesSuggestions.ts
@@ -239,15 +239,23 @@ export async function atPath(
       if (className == null) {
         const field = acc.resource?.fields.find(([key]) => key === attr)?.[1]
 
+        if (field == null) {
+          return acc
+        }
+
+        let fieldType = field.type
+
+        if (fieldType === "string" && field?.format === "datetime") {
+          fieldType = "datetime"
+        }
+
         return {
           ...acc,
-          field:
-            field != null
-              ? {
-                  ...field,
-                  name: attr,
-                }
-              : undefined,
+          field: {
+            ...field,
+            type: fieldType,
+            name: attr,
+          },
         }
       }
 
diff --git a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
index f36dc65b..1b172f8b 100644
--- a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
+++ b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionMatcher.tsx
@@ -26,10 +26,6 @@ export function ConditionMatcher({
     fieldType = guessFieldType((item as ItemWithValue | null)?.value)
   }
 
-  if (fieldType === "string" && infos?.field?.format === "datetime") {
-    fieldType = "datetime"
-  }
-
   const resourceId = infos?.resource?.id
 
   const AGGREGATED_RESOURCE = ["tag"]