Google Analytics – AMP Direct View

Hi there, I have an issue regarding AMP traffic in Google Analytics.

In the AMP plugin settings, I’ve enabled the option “Redirect mobile visitors to AMP”. Now, every time someone from Google’s organic search clicks on my website, the acquisition will be registered as “Direct” traffic instead of “Organic Search” in Google Analytics. I’d like this to be Organic Search instead of Direct.

I’m using the Transitional mode instead of the Standard mode, since Standard mode breaks my site. Currently, the url changes from example.com/post/ to example.com/post/?amp in mobile.

I’m using the Site Kit plugin to add the snippet and the View is set to “All Web Site Data”.

So, is there a way to make all the mobile Organic clicks redirect to the AMP version of my site, while still registering as Organic instead of Direct?

Thank you for the AMP plugin, a really great plugin for those who are not programmers!

The page I need help with: [log in to see the link]