diff --git a/openlp/plugins/alerts/lib/db.py b/openlp/plugins/alerts/lib/db.py
index 3656d41b8..5e4b1a99a 100644
--- a/openlp/plugins/alerts/lib/db.py
+++ b/openlp/plugins/alerts/lib/db.py
@@ -53,4 +53,5 @@ def init_schema(url):
 
     mapper(AlertItem, alerts_table)
 
-    return session, metadata
+    metadata.create_all(checkfirst=True)
+    return session
diff --git a/openlp/plugins/alerts/lib/manager.py b/openlp/plugins/alerts/lib/manager.py
index 814e3dca6..7b5cf2da0 100644
--- a/openlp/plugins/alerts/lib/manager.py
+++ b/openlp/plugins/alerts/lib/manager.py
@@ -61,8 +61,7 @@ class DBManager(object):
                 unicode(settings.value(u'db hostname').toString()),
                 unicode(settings.value(u'db database').toString()))
         settings.endGroup()
-        self.session, self.metadata = init_schema(self.db_url)
-        self.metadata.create_all(checkfirst=True)
+        self.session = init_schema(self.db_url)
         log.debug(u'Alerts Initialised')
 
     def get_all_alerts(self):
diff --git a/openlp/plugins/songs/lib/db.py b/openlp/plugins/songs/lib/db.py
index 3c1aae7cb..655043144 100644
--- a/openlp/plugins/songs/lib/db.py
+++ b/openlp/plugins/songs/lib/db.py
@@ -147,4 +147,5 @@ def init_schema(url):
             secondary=songs_topics_table)})
     mapper(Topic, topics_table)
 
-    return session, metadata
+    metadata.create_all(checkfirst=True)
+    return session
diff --git a/openlp/plugins/songs/lib/manager.py b/openlp/plugins/songs/lib/manager.py
index 0194cea5b..8e0a79ef7 100644
--- a/openlp/plugins/songs/lib/manager.py
+++ b/openlp/plugins/songs/lib/manager.py
@@ -110,8 +110,7 @@ class SongManager(object):
                     u'db hostname', QtCore.QVariant(u'')).toString()),
                 unicode(settings.value(
                     u'db database', QtCore.QVariant(u'')).toString()))
-        self.session, self.metadata = init_schema(self.db_url)
-        self.metadata.create_all(checkfirst=True)
+        self.session = init_schema(self.db_url)
         settings.endGroup()
         log.debug(u'Song Initialised')