diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 314066565..fdc15a884 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -178,8 +178,8 @@ if (($oldcomment = $document->getComment()) != $comment) {
 }
 
 $expires = false;
-if (isset($_POST["expires"]) && $_POST["expires"] != "false") {
-	if($_POST["expdate"]) {
+if (!isset($_POST["expires"]) || $_POST["expires"] != "false") {
+	if(isset($_POST["expdate"]) && $_POST["expdate"]) {
 		$tmp = explode('-', $_POST["expdate"]);
 		$expires = mktime(0,0,0, $tmp[1], $tmp[0], $tmp[2]);
 	} else {