diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index fa8f9d1f3..41ed75eba 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -848,7 +848,7 @@ INSERT INTO `Filters`
   )
 VALUES (
   'Update DiskSpace',
-  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',
+  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}',
   0/*AutoArchive*/,
   0/*AutoVideo*/,
   0/*AutoUpload*/,