diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index e04836b7..2f57ccf2 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -120,7 +120,8 @@ def main(cwd=None):
     print(strings._("preparing_files"))
     try:
         web.set_file_info(filenames)
-        app.cleanup_filenames.append(web.download_filename)
+        if web.is_zipped:
+            app.cleanup_filenames.append(web.download_filename)
     except OSError as e:
         print(e.strerror)
         sys.exit(1)
diff --git a/onionshare_gui/share_mode/threads.py b/onionshare_gui/share_mode/threads.py
index 9cda76b1..dc43bf0a 100644
--- a/onionshare_gui/share_mode/threads.py
+++ b/onionshare_gui/share_mode/threads.py
@@ -47,7 +47,8 @@ class CompressThread(QtCore.QThread):
                 # Cancelled
                 pass
 
-            self.mode.app.cleanup_filenames.append(self.mode.web.download_filename)
+            if self.mode.web.is_zipped:
+                self.mode.app.cleanup_filenames.append(self.mode.web.download_filename)
         except OSError as e:
             self.error.emit(e.strerror)