diff --git a/plugins/nf-k8s/src/main/nextflow/k8s/K8sTaskHandler.groovy b/plugins/nf-k8s/src/main/nextflow/k8s/K8sTaskHandler.groovy
index e98da988cb..664e43e34e 100644
--- a/plugins/nf-k8s/src/main/nextflow/k8s/K8sTaskHandler.groovy
+++ b/plugins/nf-k8s/src/main/nextflow/k8s/K8sTaskHandler.groovy
@@ -438,7 +438,7 @@ class K8sTaskHandler extends TaskHandler implements FusionAwareTask {
                 task.stderr = errorFile
             }
             status = TaskStatus.COMPLETED
-            savePodLogOnError(task)
+            savePodLog(task)
             deletePodIfSuccessful(task)
             updateTimestamps(state.terminated as Map)
             determineNode()
@@ -448,17 +448,7 @@ class K8sTaskHandler extends TaskHandler implements FusionAwareTask {
         return false
     }
 
-    protected void savePodLogOnError(TaskRun task) {
-        if( task.isSuccess() )
-            return
-
-        if( errorFile && !errorFile.empty() )
-            return
-
-        final session = executor.getSession()
-        if( session.isAborted() || session.isCancelled() || session.isTerminated() )
-            return
-
+    protected void savePodLog(TaskRun task) {
         try {
             final stream = useJobResource()
                     ? client.jobLog(podName)
diff --git a/plugins/nf-k8s/src/test/nextflow/k8s/K8sTaskHandlerTest.groovy b/plugins/nf-k8s/src/test/nextflow/k8s/K8sTaskHandlerTest.groovy
index 2f780ceb67..751f65371a 100644
--- a/plugins/nf-k8s/src/test/nextflow/k8s/K8sTaskHandlerTest.groovy
+++ b/plugins/nf-k8s/src/test/nextflow/k8s/K8sTaskHandlerTest.groovy
@@ -498,7 +498,7 @@ class K8sTaskHandlerTest extends Specification {
         1 * handler.updateTimestamps(termState)
         1 * handler.readExitFile() >> EXIT_STATUS
         1 * handler.deletePodIfSuccessful(task) >> null
-        1 * handler.savePodLogOnError(task) >> null
+        1 * handler.savePodLog(task) >> null
         handler.task.exitStatus == EXIT_STATUS
         handler.task.@stdout == OUT_FILE
         handler.task.@stderr == ERR_FILE
@@ -529,7 +529,7 @@ class K8sTaskHandlerTest extends Specification {
         1 * handler.updateTimestamps(termState)
         0 * handler.readExitFile()
         1 * handler.deletePodIfSuccessful(task) >> null
-        1 * handler.savePodLogOnError(task) >> null
+        1 * handler.savePodLog(task) >> null
         handler.task.exitStatus == 137
         handler.status == TaskStatus.COMPLETED
         result == true
@@ -803,20 +803,9 @@ class K8sTaskHandlerTest extends Specification {
         def handler = Spy(new K8sTaskHandler(executor: executor, client: client, podName: POD_NAME))
 
         when:
-        handler.savePodLogOnError(task)
+        handler.savePodLog(task)
         then:
-        task.isSuccess() >> true
-        0 * client.podLog(_)
-
-        when:
-        handler.savePodLogOnError(task)
-        then:
-        task.isSuccess() >> false
         task.getWorkDir() >> folder
-        executor.getSession() >> session
-        session.isTerminated() >> false
-        session.isCancelled() >> false
-        session.isAborted() >> false
         1 * client.podLog(POD_NAME) >> POD_LOG
 
         folder.resolve( TaskRun.CMD_LOG ).text == POD_MESSAGE