diff --git a/lib/queries.js b/lib/queries.js
index 47b01f88..ae39f685 100644
--- a/lib/queries.js
+++ b/lib/queries.js
@@ -184,8 +184,8 @@ export async function savePageView(website_id, session_id, url, referrer) {
       data: {
         website_id,
         session_id,
-        url: url.substr(0, URL_LENGTH),
-        referrer: referrer.substr(0, URL_LENGTH),
+        url: url?.substr(0, URL_LENGTH),
+        referrer: referrer?.substr(0, URL_LENGTH),
       },
     }),
   );
@@ -197,9 +197,9 @@ export async function saveEvent(website_id, session_id, url, event_type, event_v
       data: {
         website_id,
         session_id,
-        url: url.substr(0, URL_LENGTH),
-        event_type,
-        event_value,
+        url: url?.substr(0, URL_LENGTH),
+        event_type: event_type?.substr(0, 50),
+        event_value: event_value?.substr(0, 50),
       },
     }),
   );