2 files changed, 2 insertions, 3 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py
index 3b2d1a8ecd..3ca07f4350 100644
--- a/synapse/storage/room.py
+++ b/synapse/storage/room.py
@@ -165,8 +165,7 @@ class RoomStore(SQLBaseStore):
         rows = txn.execute(sql, (room_id, user_id,)).fetchall()
 
         if len(rows) == 1:
-            defer.returnValue(rows[0][0])
-            return
+            return rows[0][0]
 
         sql = (
             "SELECT level FROM room_default_levels as r "
diff --git a/synapse/storage/schema/im.sql b/synapse/storage/schema/im.sql
index 1de0d59066..dbefbbda31 100644
--- a/synapse/storage/schema/im.sql
+++ b/synapse/storage/schema/im.sql
@@ -150,7 +150,7 @@ CREATE TABLE IF NOT EXISTS room_ops_levels(
     event_id TEXT NOT NULL,
     room_id TEXT NOT NULL,
     ban_level INTEGER,
-    kick_level INTEGER,
+    kick_level INTEGER
 );
 
 CREATE INDEX IF NOT EXISTS room_ops_levels_event_id ON room_ops_levels(event_id);