diff --git a/circle.yml b/circle.yml
index 27e599e8a9..0241b50520 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,6 +1,8 @@
 checkout:
   post:
-    - git submodule update --init
+    # https://discuss.circleci.com/t/git-submodule-url-isnt-playing-nice-with-the-cache/549/3
+    - git submodule sync
+    - git submodule update --init --recursive || (rm -fr .git/config .git/modules && git submodule deinit -f . && git submodule update --init --recursive)
 
 dependencies:
   pre: