Adding new languages makes 404 shopify market

[neonfactory]

Hello

Ive added French language in shopify market to my store, and then now all the links in English language are wrong, error 404 because when I add new language (French) it adds /en/ to the English language too and all products and everything became 404. 

For example after adding French language, my English language links became like this myshop.com/en/collections/new (doesn't work error 404)

Instead of myshop.com/collections/new (this works). 

And also when I link my new French domain to my french language, French language got error 404 everywhere because it add /fr/ to my new French domain, for example myshop.fr/fr/collections/new instead of myshop.fr/collections/new

How to solve it? 

[ZainSSC]

@neonfactory Did you resolve the issue? I am facing the same issue after publishing language. But before publishing, if I preview it, it works fine.