diff --git a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
index 32aa931ff..d8f70d221 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/NewRepoConfig.java
@@ -73,6 +73,12 @@ public class NewRepoConfig {
             uri = Uri.parse(uri.toString().toLowerCase(Locale.ENGLISH));
         }
 
+        String path = uri.getPath();
+        if (path == null || !(path.contains("/fdroid/archive") || path.contains("/fdroid/repo"))) {
+            isValidRepo = false;
+            return;
+        }
+
         // make scheme and host lowercase so they're readable in dialogs
         scheme = scheme.toLowerCase(Locale.ENGLISH);
         host = host.toLowerCase(Locale.ENGLISH);