diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp
index a65d5f2fb0..aa3568f0d5 100644
--- a/src/common/zipstrm.cpp
+++ b/src/common/zipstrm.cpp
@@ -2287,7 +2287,7 @@ bool wxZipOutputStream::Close()
 {
     CloseEntry();
 
-    if (m_lasterror == wxSTREAM_WRITE_ERROR) {
+    if (m_lasterror == wxSTREAM_WRITE_ERROR || m_entries.size() == 0) {
         wxFilterOutputStream::Close();
         return false;
     }