diff --git a/build.gradle.kts b/build.gradle.kts
index 96bf52831a1982af1d567bf97d8a27522f36fd16..32b0c03deaec2bd42981734a307bc17bcc5b31cd 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ buildscript {
   }
   dependencies {
     classpath("com.android.tools.build:gradle:3.1.1")
-    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.31")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.2.40")
   }
 }
 
@@ -16,3 +16,15 @@ allprojects {
     maven(url = "https://jitpack.io")
   }
 }
+
+subprojects {
+  configurations.all {
+    resolutionStrategy {
+      eachDependency {
+        if (requested.name == "kotlin-compiler-embeddable") {
+          useVersion("1.2.31")
+        }
+      }
+    }
+  }
+}
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index 8a3e7d08e0103e3eca22c0b70c6a08d401b2c980..2c69ea831ed92e218d64356515bc1ce3e0e748a5 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -37,9 +37,9 @@ class QuasselViewModel : ViewModel() {
 
   val expandedMessages = BehaviorSubject.createDefault(emptySet<MsgId>())
 
-  val buffer = BehaviorSubject.createDefault(-1)
+  val buffer = BehaviorSubject.createDefault(Int.MAX_VALUE)
 
-  val bufferViewConfigId = BehaviorSubject.createDefault(-1)
+  val bufferViewConfigId = BehaviorSubject.createDefault(Int.MAX_VALUE)
 
   val MAX_RECENT_MESSAGES = 20
   val recentlySentMessages = BehaviorSubject.createDefault(emptyList<CharSequence>())