diff --git a/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt b/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt
index 9417bd2..a59c645 100644
--- a/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt
+++ b/mc-commons/src/main/kotlin/net/revive/framework/grpc/FrameworkGRPCClient.kt
@@ -30,7 +30,6 @@ object FrameworkGRPCClient {
 
         PodHeartbeatThread.apply {
             Framework.use {
-                it.flavor.inject(this)
                 start()
             }
         }
diff --git a/mc-commons/src/main/kotlin/net/revive/framework/grpc/health/PodHeartbeatThread.kt b/mc-commons/src/main/kotlin/net/revive/framework/grpc/health/PodHeartbeatThread.kt
index ca31bc8..730f90e 100644
--- a/mc-commons/src/main/kotlin/net/revive/framework/grpc/health/PodHeartbeatThread.kt
+++ b/mc-commons/src/main/kotlin/net/revive/framework/grpc/health/PodHeartbeatThread.kt
@@ -7,6 +7,7 @@ import net.revive.framework.flavor.service.Service
 import net.revive.framework.protocol.*
 import net.revive.framework.server.IMinecraftPlatform
 
+@Service
 object PodHeartbeatThread : Thread("Framework-Pod Health Reporter") {
 
     @Inject
diff --git a/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt b/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
index 03b046e..0bfc381 100644
--- a/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
+++ b/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
@@ -75,8 +75,6 @@ class PaperFrameworkPlugin : ExtendedKotlinPlugin() {
         Framework.supply(PaperFramework) {
             it.flavor = flavor()
 
-            it.flavor.inject(PodHeartbeatThread)
-
             if (it.serializer is GsonSerializer) {
                 GsonFactory.applyPlatformChanges()
                 (it.serializer as GsonSerializer).useGsonBuilderThenRebuild { gson ->