diff --git a/encryptionmanager.cpp b/encryptionmanager.cpp
index d58e6ed..67be7cd 100644
--- a/encryptionmanager.cpp
+++ b/encryptionmanager.cpp
@@ -351,7 +351,7 @@ void encryptionManager::repackEncryptedStorage() {
         std::string passphrase = global::encfs::passphrase.toStdString();
         global::encfs::passphrase = "";
         string_writeconfig("/external_root/run/encfs/encrypted_storage_repack_passphrase", passphrase);
-        string_writeconfig("/external_root/run/encfs_dry_stop", "true");
+        QFile::remove("/external_root/run/openrc/started/encfs");
         string_writeconfig("/opt/ibxd", "encfs_restart\n");
         bool exitStatus;
         ui->activityWidget->setCurrentIndex(3);
diff --git a/usbms_splash.cpp b/usbms_splash.cpp
index 6e86d9f..829ec6a 100644
--- a/usbms_splash.cpp
+++ b/usbms_splash.cpp
@@ -70,9 +70,13 @@ void usbms_splash::usbms_launch()
     if(global::usbms::koboxExportExtensions == true) {
         string_writeconfig("/opt/ibxd", "kobox_extensions_storage_unmount\n");
     }
-    else {
-        string_writeconfig("/opt/ibxd", "onboard_unmount\n");
+    if(checkconfig("/external_root/run/encfs_mounted") == true) {
+        string_writeconfig("/external_root/run/encfs_stop_cleanup", "true");
+        string_writeconfig("/opt/ibxd", "encfs_stop\n");
+        QThread::msleep(1500);
     }
+
+    string_writeconfig("/opt/ibxd", "onboard_unmount\n");
     QThread::msleep(500);
 
     string_writeconfig("/opt/ibxd", "usbnet_stop\n");