diff --git a/Clocker/Clocker/ca.lproj/Localizable.strings b/Clocker/Clocker/ca.lproj/Localizable.strings
index 941b9db8..d4d47b56 100644
--- a/Clocker/Clocker/ca.lproj/Localizable.strings
+++ b/Clocker/Clocker/ca.lproj/Localizable.strings
@@ -163,3 +163,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/de.lproj/Localizable.strings b/Clocker/Clocker/de.lproj/Localizable.strings
index 9a73dd99..30cb9aad 100644
--- a/Clocker/Clocker/de.lproj/Localizable.strings
+++ b/Clocker/Clocker/de.lproj/Localizable.strings
@@ -163,3 +163,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/en.lproj/Localizable.strings b/Clocker/Clocker/en.lproj/Localizable.strings
index e535c0a1..08402283 100644
--- a/Clocker/Clocker/en.lproj/Localizable.strings
+++ b/Clocker/Clocker/en.lproj/Localizable.strings
@@ -163,5 +163,8 @@
 "Daylights Saving transition will occur in < 24 hours" = "Daylights Saving transition will occur in < 24 hours";
 
 "Copied to Clipboard" = "Copied to Clipboard";
+
+// Upcoming Event View
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/es.lproj/Localizable.strings b/Clocker/Clocker/es.lproj/Localizable.strings
index 2dd112cb..7870ae75 100644
--- a/Clocker/Clocker/es.lproj/Localizable.strings
+++ b/Clocker/Clocker/es.lproj/Localizable.strings
@@ -165,3 +165,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/fr.lproj/Localizable.strings b/Clocker/Clocker/fr.lproj/Localizable.strings
index c17269c2..5182cb7d 100644
--- a/Clocker/Clocker/fr.lproj/Localizable.strings
+++ b/Clocker/Clocker/fr.lproj/Localizable.strings
@@ -164,3 +164,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/hi.lproj/Localizable.strings b/Clocker/Clocker/hi.lproj/Localizable.strings
index ab3fd08e..13353a51 100644
--- a/Clocker/Clocker/hi.lproj/Localizable.strings
+++ b/Clocker/Clocker/hi.lproj/Localizable.strings
@@ -159,3 +159,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/hr.lproj/Localizable.strings b/Clocker/Clocker/hr.lproj/Localizable.strings
index b6675e91..2d47fbc1 100644
--- a/Clocker/Clocker/hr.lproj/Localizable.strings
+++ b/Clocker/Clocker/hr.lproj/Localizable.strings
@@ -165,3 +165,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/it.lproj/Localizable.strings b/Clocker/Clocker/it.lproj/Localizable.strings
index 9963a295..e1b4c004 100644
--- a/Clocker/Clocker/it.lproj/Localizable.strings
+++ b/Clocker/Clocker/it.lproj/Localizable.strings
@@ -164,3 +164,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/ja.lproj/Localizable.strings b/Clocker/Clocker/ja.lproj/Localizable.strings
index 07653757..d0af20a3 100644
--- a/Clocker/Clocker/ja.lproj/Localizable.strings
+++ b/Clocker/Clocker/ja.lproj/Localizable.strings
@@ -163,3 +163,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/ko.lproj/Localizable.strings b/Clocker/Clocker/ko.lproj/Localizable.strings
index 41f94b75..d424b7dc 100644
--- a/Clocker/Clocker/ko.lproj/Localizable.strings
+++ b/Clocker/Clocker/ko.lproj/Localizable.strings
@@ -166,3 +166,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/nl.lproj/Localizable.strings b/Clocker/Clocker/nl.lproj/Localizable.strings
index 941b9db8..d4d47b56 100644
--- a/Clocker/Clocker/nl.lproj/Localizable.strings
+++ b/Clocker/Clocker/nl.lproj/Localizable.strings
@@ -163,3 +163,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/pt-BR.lproj/Localizable.strings b/Clocker/Clocker/pt-BR.lproj/Localizable.strings
index aca7df19..6bb78f17 100644
--- a/Clocker/Clocker/pt-BR.lproj/Localizable.strings
+++ b/Clocker/Clocker/pt-BR.lproj/Localizable.strings
@@ -164,3 +164,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/ru.lproj/Localizable.strings b/Clocker/Clocker/ru.lproj/Localizable.strings
index 3ae406a3..864f2b67 100644
--- a/Clocker/Clocker/ru.lproj/Localizable.strings
+++ b/Clocker/Clocker/ru.lproj/Localizable.strings
@@ -156,3 +156,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
index 94d81bef..1c4358ff 100644
--- a/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hans.lproj/Localizable.strings
@@ -157,3 +157,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Clocker/zh-Hant.lproj/Localizable.strings b/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
index 661869df..6362e269 100644
--- a/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
+++ b/Clocker/Clocker/zh-Hant.lproj/Localizable.strings
@@ -164,3 +164,4 @@
 "Copied to Clipboard" = "Copied to Clipboard";
 "No upcoming events for today!" = "No upcoming events for today!";
 "Great going." = "Great going.";
+"Happy Weekend." = "Happy Weekend.";
diff --git a/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift b/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift
index c9e2acfa..247ec5a9 100644
--- a/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift	
+++ b/Clocker/Panel/Upcoming Events/UpcomingEventViewItem.swift	
@@ -26,6 +26,7 @@ class UpcomingEventViewItem: NSCollectionViewItem {
         zoomButton.image = nil
         eventTitleLabel.stringValue = ""
         eventSubtitleButton.stringValue = ""
+        meetingLink = nil
     }
 
     override var acceptsFirstResponder: Bool {
@@ -85,8 +86,10 @@ class UpcomingEventViewItem: NSCollectionViewItem {
     }
 
     func setupEmptyState() {
+        let subtitle = NSCalendar.autoupdatingCurrent.isDateInWeekend(Date()) ? NSLocalizedString("Happy Weekend.", comment: "Button Title for no upcoming event") : NSLocalizedString("Great going.", comment: "Button Title for no upcoming event")
+        
         setAlternateState(NSLocalizedString("No upcoming events for today!", comment: "Next Event Label with no upcoming event"),
-                          NSLocalizedString("Great going.", comment: "Button Title for no upcoming event"),
+                          subtitle,
                           NSColor.systemGreen,
                           nil)
     }
@@ -121,7 +124,9 @@ class UpcomingEventViewItem: NSCollectionViewItem {
         panelDelegate?.didClickSupplementaryButton(sender)
     }
 
-    @objc func zoomButtonAction(_: Any) {
+    @objc func zoomButtonAction(_ sender: NSButton) {
+        guard sender.image != nil else { return }
+        
         if let meetingURL = meetingLink {
             NSWorkspace.shared.open(meetingURL)
         } else {