diff --git a/application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java b/application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java
index 1dd6053562..826b290565 100644
--- a/application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java
+++ b/application/src/main/java/org/togetherjava/tjbot/features/help/HelpThreadAutoArchiver.java
@@ -79,6 +79,9 @@ private Instant computeArchiveAfterMoment() {
     }
 
     private void autoArchiveForThread(ThreadChannel threadChannel, Instant archiveAfterMoment) {
+        // if threadChannel is pinned then do not archive it!
+        if (threadChannel.isPinned())
+            return;
         if (shouldBeArchived(threadChannel, archiveAfterMoment)) {
             logger.debug("Auto archiving help thread {}", threadChannel.getId());