Are you using the CalendarName column in DimCalendar to filter the results to give the 1:1 relationship to DimDate?
Beyond setting the property as non-aggregatable and setting a default, how else would you do this? I don't rule out that I'm missing something on this point, but I can't imagine what else there would be to do.