diff --git a/src/components/QueryNav/DropdownGroup.tsx b/src/components/QueryNav/DropdownGroup.tsx
index 6df509c..56a937b 100644
--- a/src/components/QueryNav/DropdownGroup.tsx
+++ b/src/components/QueryNav/DropdownGroup.tsx
@@ -36,9 +36,9 @@ export const DropdownGroup = () => {
   // *** Param variables
   const seasonParam =
     searchParams.get('season') || new Date().getFullYear().toString();
-  const eventParam = searchParams.get('event') || eventDefault;
-  const sessionParam = searchParams.get('session') || sessionDefault;
-  const driversParam = searchParams.get('drivers') || driverDefault;
+  const eventParam = searchParams.get('event') || '';
+  const sessionParam = searchParams.get('session') || '';
+  const driversParam = searchParams.get('drivers') || '';
 
   // *** Handles hydration on page load
   // Populate state from params
@@ -165,7 +165,7 @@ export const DropdownGroup = () => {
         action={(value) => dropdownAction('season', value)}
       />
       <Dropdown
-        value={event}
+        value={event || eventDefault}
         items={
           // Todo remove logic from jsx
           eventList.length <= 0
@@ -175,12 +175,12 @@ export const DropdownGroup = () => {
         action={(value) => dropdownAction('event', value)}
       />
       <Dropdown
-        value={session}
+        value={session || sessionDefault}
         items={sessionList}
         action={(value) => dropdownAction('session', value)}
       />
       <Dropdown
-        value={driver}
+        value={driver || driverDefault}
         items={
           driverList.length <= 0
             ? []
diff --git a/src/state-mgmt/fetchCalls.tsx b/src/state-mgmt/fetchCalls.tsx
index cf9afdc..8f8b9d8 100644
--- a/src/state-mgmt/fetchCalls.tsx
+++ b/src/state-mgmt/fetchCalls.tsx
@@ -86,16 +86,18 @@ export const fetchDriverList = atomEffect((get, set) => {
   const eventList = get(EventListState);
 
   // This indicated eventList has not been fetched has not loaded
-  if (eventName && eventList.length <= 0) {
+  // Or that no event has been input
+  if (!eventName || (eventName && eventList.length <= 0)) {
     return;
   }
 
+  // Find specfic event from event states
   const event = eventList.find((evt) => evt.EventName === eventName);
 
   // Set error if no matching event && there is an event specified
   if (!event && eventName !== eventDefault) {
     set(serverErrorState, eventErrorMsg);
-    return;
+    // return;
   }
 
   // Confirm event exists