diff --git a/session/session.go b/session/session.go
index 0f7d8403..d6e9afd5 100644
--- a/session/session.go
+++ b/session/session.go
@@ -168,7 +168,9 @@ func (s *Session) setupInput() error {
 }
 
 func (s *Session) Close() {
-	s.Events.Add("session.closing", nil)
+	if *s.Options.Debug {
+		s.Events.Add("session.closing", nil)
+	}
 
 	for _, m := range s.Modules {
 		if m.Running() {
@@ -281,7 +283,9 @@ func (s *Session) Start() error {
 		}
 	}()
 
-	s.Events.Add("session.started", nil)
+	if *s.Options.Debug {
+		s.Events.Add("session.started", nil)
+	}
 
 	return nil
 }