diff --git a/openlp/core/lib/plugin.py b/openlp/core/lib/plugin.py
index a79ba850a..1950477ed 100644
--- a/openlp/core/lib/plugin.py
+++ b/openlp/core/lib/plugin.py
@@ -308,12 +308,12 @@ class Plugin(QtCore.QObject):
         Perform tasks on application startup
         """
         # FIXME: Remove after 2.2 release.
-        # This is needed to load the list of images/media/presentation from the config saved
-        # before the settings rewrite.
+        # This is needed to load the list of media/presentation from the config saved before the settings rewrite.
         if self.media_item_class is not None and self.name != u'images':
             loaded_list = Settings().get_files_from_config(self)
             # Now save the list to the config using our Settings class.
-            Settings().setValue(u'%s/%s files' % (self.settings_section, self.name), loaded_list)
+            if loaded_list:
+                Settings().setValue(u'%s/%s files' % (self.settings_section, self.name), loaded_list)
 
     def uses_theme(self, theme):
         """