diff --git a/.gitignore b/.gitignore
index 759e3286..dc885955 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,5 @@
 /binaries
 /checksums.txt
 /.env*
+ui/
+gptscript.code-workspace
diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index cf64ef6c..9de4ff3c 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -255,6 +255,9 @@ func putHistory(messages []types.CompletionMessage) []types.CompletionMessage {
 			slog.Error("Unmarshal Error", err)
 			return messages
 		}
+		if message.Role == "system" {
+			continue
+		}
 		prevMessages = append(prevMessages, message)
 	}