diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
index 00d03abd5943a5c42b82ce40a66783ab3f08b770..b7ff9e364b810c1fe0d6a120f8a342dcd8b2a2bb 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt
@@ -307,14 +307,14 @@ class IrcChannel(
     removeUserMode(network().ircUser(nick), mode)
   }
 
-  override fun addChannelMode(mode: Char, value: String) {
+  override fun addChannelMode(mode: Char, value: String?) {
     when (network().channelModeType(mode)) {
       INetwork.ChannelModeType.A_CHANMODE     ->
-        _A_channelModes.getOrPut(mode, ::mutableSetOf).add(value)
+        _A_channelModes.getOrPut(mode, ::mutableSetOf).add(value!!)
       INetwork.ChannelModeType.B_CHANMODE     ->
-        _B_channelModes[mode] = value
+        _B_channelModes[mode] = value!!
       INetwork.ChannelModeType.C_CHANMODE     ->
-        _C_channelModes[mode] = value
+        _C_channelModes[mode] = value!!
       INetwork.ChannelModeType.D_CHANMODE     ->
         _D_channelModes.add(mode)
       INetwork.ChannelModeType.NOT_A_CHANMODE ->
@@ -323,7 +323,7 @@ class IrcChannel(
     super.addChannelMode(mode, value)
   }
 
-  override fun removeChannelMode(mode: Char, value: String) {
+  override fun removeChannelMode(mode: Char, value: String?) {
     when (network().channelModeType(mode)) {
       INetwork.ChannelModeType.A_CHANMODE     ->
         _A_channelModes.getOrPut(mode, ::mutableSetOf).remove(value)
diff --git a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
index 18070d0ea9d41b10d9f41f120e41bc708dc79c18..d0bcbd41566843c574f34646727d7345649ade3a 100644
--- a/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/quassel/syncables/interfaces/IIrcChannel.kt
@@ -16,7 +16,7 @@ interface IIrcChannel : ISyncableObject {
   fun initSetProperties(properties: QVariantMap)
 
   @Slot
-  fun addChannelMode(mode: Char, value: String) {
+  fun addChannelMode(mode: Char, value: String?) {
     SYNC("addChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString))
   }
 
@@ -47,7 +47,7 @@ interface IIrcChannel : ISyncableObject {
   }
 
   @Slot
-  fun removeChannelMode(mode: Char, value: String) {
+  fun removeChannelMode(mode: Char, value: String?) {
     SYNC("removeChannelMode", ARG(mode, Type.QChar), ARG(value, Type.QString))
   }