diff --git a/repos/system_upgrade/cloudlinux/actors/enableyumspacewalkplugin/actor.py b/repos/system_upgrade/cloudlinux/actors/enableyumspacewalkplugin/actor.py
index 76a1a30288..f5faa7cdb8 100644
--- a/repos/system_upgrade/cloudlinux/actors/enableyumspacewalkplugin/actor.py
+++ b/repos/system_upgrade/cloudlinux/actors/enableyumspacewalkplugin/actor.py
@@ -4,6 +4,7 @@
 from leapp.reporting import Report
 from leapp.libraries.common.cllaunch import run_on_cloudlinux
 
+
 try:
     # py2
     import ConfigParser as configparser
diff --git a/repos/system_upgrade/common/libraries/repofileutils.py b/repos/system_upgrade/common/libraries/repofileutils.py
index 7a87712174..64bac3ee42 100644
--- a/repos/system_upgrade/common/libraries/repofileutils.py
+++ b/repos/system_upgrade/common/libraries/repofileutils.py
@@ -30,11 +30,14 @@ def _prepare_config(repodata, config_parser):
     for repo in repodata.data:
         config_parser.add_section(repo.repoid)
 
-        repo_enabled = 1 if repo.enabled else 0
         config_parser.set(repo.repoid, 'name', repo.name)
         config_parser.set(repo.repoid, 'baseurl', repo.baseurl)
-        config_parser.set(repo.repoid, 'metalink', repo.metalink)
-        config_parser.set(repo.repoid, 'mirrorlist', repo.mirrorlist)
+        if repo.metalink:
+            config_parser.set(repo.repoid, 'metalink', repo.metalink)
+        if repo.mirrorlist:
+            config_parser.set(repo.repoid, 'mirrorlist', repo.mirrorlist)
+
+        repo_enabled = '1' if repo.enabled else '0'
         config_parser.set(repo.repoid, 'enabled', repo_enabled)