diff --git a/CHANGELOG b/CHANGELOG
index d12cf9f111cb639ecf1eadff53c1a74a3710aa91..9ea9bfa8ef40903fa7630cb62582ad4d037dc0bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 minerva (16.2.8) stable; urgency=medium
   * Bug fix: missing content-type header in REST API documentation caused issues
-    with converter API (#1745, #1754, #1759)
+    with converter API (#1745, #1754, #1759, #1755)
+  * Bug fix: MINERVA_AUTH token in REST API documentation was sometimes missing
+    and sometimes it was unnecessary (#1744)
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Sat, 03 Sep 2022 22:00:00 +0200
 
diff --git a/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java b/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java
index 9a5fefe85c233b117a81f724c9dce07b8a9b0aa7..b42b9465db3d4735d39ef7221928fbfc202ea16c 100644
--- a/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java
+++ b/web/src/test/java/lcsb/mapviewer/web/utils/CommandFormatterWithReplacingPostFilenameHeader.java
@@ -52,6 +52,9 @@ public class CommandFormatterWithReplacingPostFilenameHeader implements CommandF
   @Override
   public String format(final List<String> elements) {
     if (CollectionUtils.isEmpty(elements)) {
+      if (session) {
+        return String.format(this.separator) + "--cookie \"" + Configuration.AUTH_TOKEN + "=xxxxxxxx\"";
+      }
       return "";
     }
     String contentFileName = getContentFileName(elements);
diff --git a/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java b/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java
index 3c37f8e3e963d06d5720b3a02564f54c81df4a25..21fe1f46c9f19a4957ee55b33423d0535147786a 100644
--- a/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java
+++ b/web/src/test/java/lcsb/mapviewer/web/utils/CustomCurlRequestSnippet.java
@@ -2,6 +2,8 @@ package lcsb.mapviewer.web.utils;
 
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.restdocs.cli.CommandFormatter;
 import org.springframework.restdocs.cli.CurlRequestSnippet;
 import org.springframework.restdocs.operation.Operation;
@@ -17,6 +19,8 @@ import org.springframework.restdocs.operation.Operation;
  */
 public class CustomCurlRequestSnippet extends CurlRequestSnippet {
 
+  protected static Logger logger = LogManager.getLogger();
+
   private final CommandFormatter commandFormatter;
 
   public CustomCurlRequestSnippet(final CommandFormatter commandFormatter) {
@@ -35,6 +39,9 @@ public class CustomCurlRequestSnippet extends CurlRequestSnippet {
     boolean session = false;
     if (obj instanceof org.springframework.mock.web.MockHttpServletRequest) {
       session = (((org.springframework.mock.web.MockHttpServletRequest) obj).getSession() != null);
+      if (session) {
+        session = !((org.springframework.mock.web.MockHttpServletRequest) obj).getSession().isNew();
+      }
     }
     if (commandFormatter instanceof CommandFormatterWithReplacingPostFilenameHeader) {
       ((CommandFormatterWithReplacingPostFilenameHeader) commandFormatter).setSessionAvailable(session);