diff --git a/src/components/drive/SecretLink.vue b/src/components/drive/SecretLink.vue
index 5296e462..3e47f955 100644
--- a/src/components/drive/SecretLink.vue
+++ b/src/components/drive/SecretLink.vue
@@ -180,10 +180,10 @@ module.exports = {
                 }
             },
             getExpiry: function() {
-                if (! this.hasExpiry)
-                    return java.util.Optional.empty();
                 let dateExpiry = document.getElementById("expiry-date-picker");
                 let dateS = dateExpiry.value;
+                if (! this.hasExpiry || dateS == "")
+                    return java.util.Optional.empty();
                 let timeExpiry = document.getElementById("expiry-time-picker");
                 let expireTimeString = "00:00";
                 if (timeExpiry != null) {