diff --git a/ion/src/shared/events_keyboard.cpp b/ion/src/shared/events_keyboard.cpp
index a378ea0fb..1c56952e0 100644
--- a/ion/src/shared/events_keyboard.cpp
+++ b/ion/src/shared/events_keyboard.cpp
@@ -134,7 +134,7 @@ Event getEvent(int * timeout) {
     }
   }
   Event e = innerGetEvent(timeout);
-  if (sDestinationJournal != nullptr && e != None) {
+  if (sDestinationJournal != nullptr) {
     sDestinationJournal->pushEvent(e);
   }
   return e;
diff --git a/ion/src/simulator/shared/journal/queue_journal.h b/ion/src/simulator/shared/journal/queue_journal.h
index 5038e6250..71d62cc79 100644
--- a/ion/src/simulator/shared/journal/queue_journal.h
+++ b/ion/src/simulator/shared/journal/queue_journal.h
@@ -11,7 +11,9 @@ namespace Journal {
 class QueueJournal : public Ion::Events::Journal {
 public:
   void pushEvent(Ion::Events::Event e) override {
-    m_eventStorage.push(e);
+    if (e != Ion::Events::None) {
+      m_eventStorage.push(e);
+    }
   }
   virtual Ion::Events::Event popEvent() override {
     if (isEmpty()) {