diff --git a/src/views/Submit.vue b/src/views/Submit.vue
index 62fc79f4d..7102ad7ae 100644
--- a/src/views/Submit.vue
+++ b/src/views/Submit.vue
@@ -55,7 +55,8 @@
 					class="form-desc"
 					dir="auto"
 					v-html="formDescription" />
-				<p v-if="isExpired" class="info-message">
+				<!-- Show expiration message-->
+				<p v-if="form.expires && form.showExpiration" class="info-message">
 					{{ expirationMessage }}
 				</p>
 				<!-- Generate form information message-->