diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 2c642675..29572185 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -288,6 +288,8 @@ def fill_config_defaults(thisconfig):
         logging.warning(_('apksigner not found! Cannot sign or verify modern APKs'))
 
     if 'ipfs_cid' not in thisconfig and shutil.which('ipfs_cid'):
+        thisconfig['ipfs_cid'] = shutil.which('ipfs_cid')
+    if not thisconfig.get('ipfs_cid'):
         logging.warning(_("ipfs_cid not found, skipping CIDv1 generation"))
 
     for k in ['ndk_paths', 'java_paths']: