diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3204bfdc..873a790c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Updated argo-workflows to v3.1.8 to address CVE-2021-37914
   (https://github.com/argoproj/argo-workflows/security/advisories/GHSA-h563-xh25-x54q).
 
+### Fixed
+* Duplicated log entries when streaming logs.
+
 ## [0.8.1] - 2021-08-20
 ### Fixed
 * Target credential_type only supports 'assumed_role'.
diff --git a/cli/cmd/logs.go b/cli/cmd/logs.go
index 5c020601..a5784516 100644
--- a/cli/cmd/logs.go
+++ b/cli/cmd/logs.go
@@ -25,14 +25,13 @@ var logsCmd = &cobra.Command{
 		if streamLogs {
 			// This is a _very_ simple approach to streaming.
 			cobra.CheckErr(apiCl.StreamLogs(context.Background(), os.Stdout, workflowName))
+		} else {
+			resp, err := apiCl.GetLogs(context.Background(), workflowName)
+			if err != nil {
+				cobra.CheckErr(err)
+			}
+			fmt.Println(strings.Join(resp.Logs, "\n"))
 		}
-
-		resp, err := apiCl.GetLogs(context.Background(), workflowName)
-		if err != nil {
-			cobra.CheckErr(err)
-		}
-
-		fmt.Println(strings.Join(resp.Logs, "\n"))
 	},
 }