diff --git a/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt b/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt
index 21bc9c5491c528eabeaa89c0e8c937a2e181074a..cd33b4021a6e9c3b9fc1dbc5bc746dd1f3f44ba4 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/HeartBeatThread.kt
@@ -15,9 +15,10 @@ class HeartBeatThread(private val session: Session) : Thread() {
       val now = Instant.now()
       val duration = Duration.between(lastHeartBeatReply, now).toMillis()
       if (duration > TIMEOUT) {
-        log(INFO, "Session", "Ping Timeout: Last Response ${duration}ms ago")
+        log(INFO, "Heartbeat", "Ping Timeout: Last Response ${duration}ms ago")
         session.close()
       } else {
+        log(INFO, "Heartbeat", "Sending Heartbeat")
         session.dispatch(SignalProxyMessage.HeartBeat(now))
       }
     }
diff --git a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
index 361c206705f9025a7206bd875659e354d6159e33..e2dabf554ea11519168666d4a986b8077138608b 100644
--- a/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
+++ b/lib/src/main/java/de/kuschku/libquassel/session/Session.kt
@@ -27,6 +27,8 @@ import de.kuschku.libquassel.quassel.ExtendedFeature
 import de.kuschku.libquassel.quassel.QuasselFeatures
 import de.kuschku.libquassel.quassel.syncables.*
 import de.kuschku.libquassel.util.compatibility.HandlerService
+import de.kuschku.libquassel.util.compatibility.LoggingHandler
+import de.kuschku.libquassel.util.compatibility.LoggingHandler.Companion.log
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
@@ -239,6 +241,7 @@ class Session(
     val now = Instant.now()
     heartBeatThread.setLastHeartBeatReply(f.timestamp)
     val latency = now.toEpochMilli() - f.timestamp.toEpochMilli()
+    log(LoggingHandler.LogLevel.INFO, "Heartbeat", "Received Heartbeat with ${latency}ms latency")
     lag.onNext(latency)
     return true
   }