diff --git a/src/main/scala/de/thm/arsnova/services/SessionMotdService.scala b/src/main/scala/de/thm/arsnova/services/SessionMotdService.scala
index 93c46e75d5e3a46baad0470553c6ff4c9160cd47..9b5ba719664747d04f4099aeba6590da44ffd31d 100644
--- a/src/main/scala/de/thm/arsnova/services/SessionMotdService.scala
+++ b/src/main/scala/de/thm/arsnova/services/SessionMotdService.scala
@@ -1,29 +1,29 @@
 package de.thm.arsnova.services
 
-import de.thm.arsnova.models.{SessionMotd, SessionMotdId}
+import de.thm.arsnova.models.{SessionMotd, SessionMotdId, SessionId}
 import slick.driver.MySQLDriver.api._
 import scala.concurrent.Future
 
 object SessionMotdService extends BaseService {
   def getById(motdId: SessionMotdId): Future[SessionMotd] = {
-    globalMotdsTable.filter(_.id === motdId).result.head
+    sessionMotdsTable.filter(_.id === motdId).result.head
   }
 
-  def getByAudience(audience: String): Future[Seq[SessionMotd]] = {
-    globalMotdsTable.filter(_.audience === audience).result
+  def getBySessionId(sessionId: SessionId): Future[Seq[SessionMotd]] = {
+    sessionMotdsTable.filter(_.sessionId === sessionId).result
   }
 
   def create(motd: SessionMotd): Future[SessionMotdId] = {
-    globalMotdsTable.returning(globalMotdsTable.map(_.id)) += motd
+    sessionMotdsTable.returning(sessionMotdsTable.map(_.id)) += motd
   }
 
   def update(motd: SessionMotd): Future[Int] = {
-    globalMotdsTable.filter(_.id === motd.id.get).map(m =>
+    sessionMotdsTable.filter(_.id === motd.id.get).map(m =>
       (m.title, m.text))
         .update(motd.title, motd.text)
   }
 
   def delete(motdId: SessionMotdId): Future[Int] = {
-    globalMotdsTable.filter(_.id === motdId).delete
+    sessionMotdsTable.filter(_.id === motdId).delete
   }
 }