diff --git a/src/app/actions/monitoringActions.ts b/src/app/actions/monitoringActions.ts
index a7e3842..9bbb40f 100644
--- a/src/app/actions/monitoringActions.ts
+++ b/src/app/actions/monitoringActions.ts
@@ -114,6 +114,8 @@ export async function fetchLastMonitoringCheck() {
 
 			if (parsed?.message_body?.searches_by_status) {
 				return parsed.message_body;
+			} else {
+				return null
 			}
 		}
 	} catch (error) {
diff --git a/src/app/actions/violationActions.ts b/src/app/actions/violationActions.ts
index 1f66284..580d5dc 100644
--- a/src/app/actions/violationActions.ts
+++ b/src/app/actions/violationActions.ts
@@ -88,7 +88,6 @@ export async function getViolationFilesArray(props: {
 	file_name?: string
 }) {
 	const token = await getSessionData('token');
-	console.log('getViolationFilesArray');
 	const { page, size, start_date, end_date, file_name } = props;
 
 	try {
diff --git a/src/app/ui/dashboard/new/dashboard-user-violations.tsx b/src/app/ui/dashboard/new/dashboard-user-violations.tsx
index 96bd17c..1c9b628 100644
--- a/src/app/ui/dashboard/new/dashboard-user-violations.tsx
+++ b/src/app/ui/dashboard/new/dashboard-user-violations.tsx
@@ -82,7 +82,7 @@ export default function DashboardUserViolations() {
 					</div>
 				)}
 
-				{violationData?.content.length ? (
+				{violationData?.content?.length ? (
 					violationData?.content.map((file) => {
 						return (
 							<div
diff --git a/src/app/ui/header/notificationsButton.tsx b/src/app/ui/header/notificationsButton.tsx
index 2e66561..04554ae 100644
--- a/src/app/ui/header/notificationsButton.tsx
+++ b/src/app/ui/header/notificationsButton.tsx
@@ -147,19 +147,13 @@ export default function NotificationsButton() {
 				<svg viewBox="0 0 24 24" fill="currentColor" style={{ width: "20px", height: "20px" }}>
 					<path d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"></path>
 				</svg>
-				{(notificationList?.unreadCount !== 0 && notificationList?.unreadCount !== undefined) ? (
+				{(notificationList?.unreadCount !== 0 && notificationList?.unreadCount !== undefined) && (
 					<span
 						className="notification-unread-count"
 					/* style={{ fontSize: getFontSizeByCount(notificationList?.unreadCount) }} */
 					>
 						{notificationList?.unreadCount > 9 ? '9+' : notificationList?.unreadCount}
 					</span>
-				) : (
-					<span
-						className="notification-unread-count"
-					>
-						0
-					</span>
 				)}
 			</button>
 			<div className={`notification-dropdown ${isOpen ? 'show' : ''}`}>