diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index cac5c8ce5..0d1033479 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1374,8 +1374,6 @@ void CNeutrinoApp::upgradeSetup(const char * fname)
 
 	g_settings.version_pseudo = NEUTRINO_VERSION_PSEUDO;
 	configfile.setString("version_pseudo", g_settings.version_pseudo);
-
-	saveSetup(NEUTRINO_SETTINGS_FILE);
 }
 
 /**************************************************************************************
diff --git a/src/system/settings.cpp b/src/system/settings.cpp
index edeab92e1..5ea31f7a5 100644
--- a/src/system/settings.cpp
+++ b/src/system/settings.cpp
@@ -22,7 +22,6 @@
 */
 
 #include <cstring>
-#include <unistd.h>
 #include <system/settings.h>
 
 #include <zapit/settings.h>
@@ -187,10 +186,6 @@ bool CScanSettings::loadSettings(const char * const fileName)
 
 bool CScanSettings::saveSettings(const char * const fileName)
 {
-	// get sure we got initialized variables
-	if (access(fileName, R_OK) != 0)
-		loadSettings(fileName);
-
 	configfile.setInt32("bouquetMode", bouquetMode);
 	configfile.setInt32("scanType", scanType);