diff --git a/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java
new file mode 100644
index 000000000..20abd1dec
--- /dev/null
+++ b/app/src/androidTest/java/org/tasks/caldav/CaldavClientTest.java
@@ -0,0 +1,13 @@
+package org.tasks.caldav;
+
+import android.support.test.runner.AndroidJUnit4;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class CaldavClientTest {
+  @Test
+  public void dontCrashOnSpaceInUrl() {
+    new CaldavClient("https://example.com/remote.php/a space/", "username", "password");
+  }
+}
diff --git a/app/src/main/java/org/tasks/caldav/CaldavClient.java b/app/src/main/java/org/tasks/caldav/CaldavClient.java
index 8c42b6cfe..682d5009c 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavClient.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavClient.java
@@ -25,7 +25,6 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -73,8 +72,7 @@ class CaldavClient {
             .followSslRedirects(true)
             .readTimeout(30, TimeUnit.SECONDS)
             .build();
-    URI uri = URI.create(url);
-    httpUrl = HttpUrl.get(uri);
+    httpUrl = HttpUrl.parse(url);
   }
 
   private String tryFindPrincipal() throws DavException, IOException {