diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
index c1039dd5f..693b7a82e 100644
--- a/common/flatpak-dir.c
+++ b/common/flatpak-dir.c
@@ -6752,6 +6752,9 @@ flatpak_dir_check_add_remotes_config_dir (FlatpakDir  *self,
   if (!flatpak_dir_maybe_ensure_repo (self, NULL, error))
     return FALSE;
 
+  if (self->repo == NULL)
+    return TRUE;
+
   config = ostree_repo_get_config (self->repo);
 
   if (config == NULL)