Do I need to pass by HK immigration from Macau?

I am set to arrive at HKIA and take a turbojet ferry from the airport going to macau. It was stated there that transit passengers (air to sea travel) are no longer required to go through HK immigration but instead at Macau immigration only. But I'm also planning to get back to HK for 2 days stay so I'm wondering if there is still a need for me to go through the immigration upon arrival at Hong kong-macau ferry terminal at sheung wan? Anyways, my flight arrival and departure are both based on HKIA.