diff --git a/webapp/src/components/workspace.tsx b/webapp/src/components/workspace.tsx
index d878c003e..b4ed9d0d7 100644
--- a/webapp/src/components/workspace.tsx
+++ b/webapp/src/components/workspace.tsx
@@ -62,7 +62,11 @@ function CenterContent(props: Props) {
             property = board?.fields.cardProperties.find((o) => o.type === 'select')
         }
 
-        const displayProperty = dateDisplayProperty
+        let displayProperty = dateDisplayProperty
+        if (!displayProperty && activeView.fields.viewType === 'calendar') {
+            displayProperty = board.fields.cardProperties.find((o) => o.type === 'date')
+        }
+
         return (
             <CenterPanel
                 clientConfig={clientConfig}