diff --git a/core/divecomputer.c b/core/divecomputer.c
index e7c5e783a..cb3f43937 100644
--- a/core/divecomputer.c
+++ b/core/divecomputer.c
@@ -2,7 +2,6 @@
 
 #include "divecomputer.h"
 #include "event.h"
-#include "eventname.h"
 #include "extradata.h"
 #include "pref.h"
 #include "sample.h"
@@ -443,7 +442,6 @@ struct event *add_event(struct divecomputer *dc, unsigned int time, int type, in
 
 	add_event_to_dc(dc, ev);
 
-	remember_event_name(name);
 	return ev;
 }
 
diff --git a/core/event.c b/core/event.c
index fe38bbebb..defdffc34 100644
--- a/core/event.c
+++ b/core/event.c
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "event.h"
+#include "eventname.h"
 #include "subsurface-string.h"
 
 #include <string.h>
@@ -79,6 +80,8 @@ struct event *create_event(unsigned int time, int type, int flags, int value, co
 		break;
 	}
 
+	remember_event_name(name);
+
 	return ev;
 }