Power BI DAX: Calendar Table Integration Breaking Existing Measure Logic

Hi PowerBI Community,

I have an interesting DAX challenge involving the integration of a new Calendar table into an existing model. Here's my scenario:

I have three tables:

1. A fact table (TABLE1) with transaction dates and client IDs
2. A budget table (TABLE2) with monthly amounts, linked to TABLE1 through a YearMonth concatenated field (format: YYYYMM)
3. A newly added Calendar table linked to TABLE1 through date relationships

Previously, I had a measure that calculated remaining budget amounts for the year based on a date slicer connected directly to TABLE1's date field. The measure worked perfectly. However, after introducing the Calendar table as my master date table (with the slicer now connected to Calendar), the measure returns blank values.

Here's my original working measure (masked for privacy):

Measure_Name = 
VAR CurrentDate = MAX(TABLE1[DATE_FIELD])
VAR YearStartDate = DATE(YEAR(CurrentDate), 1, 1)
VAR CurrentMonth = MONTH(CurrentDate)
RETURN
CALCULATE(
SUM(TABLE2[AMOUNT_FIELD]),
FILTER(
CROSSJOIN(
ALL(TABLE1[DATE_FIELD]),
VALUES(TABLE1[CLIENT_ID])
),
MONTH(TABLE1[DATE_FIELD]) > CurrentMonth &&
YEAR(TABLE1[DATE_FIELD]) = YEAR(CurrentDate)
)
)

The measure calculates future month budgets based on the selected date. It worked when the slicer was connected directly to TABLE1[DATE_FIELD], but now that I'm using a Calendar table for date selection, it's not working.

My table relationships are:

• Calendar[Date] -> TABLE1[DATE_FIELD]
• TABLE1[YEARMONTH] -> TABLE2[YEARMONTH]

How can I modify this measure to work with the Calendar table while maintaining the same calculation logic?

Below is sample data:

• https://drive.google.com/file/d/1mDdm9CmTebgXARfgseHC4ZGC5MrTx7rJ/view
• https://drive.google.com/file/d/1VsYOketE5NOmmNkLPiRFXHA6Y0FUUJLx/view
• https://drive.google.com/file/d/18udRPZns2Vv5f3tBUPGsRAwitG5R8ECm/view

Any help would be greatly appreciated!