diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index 50c8c33e0..daa8ab72d 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -190,7 +190,7 @@ void RsInit::InitRsConfig()
 	rsInitConfig->passwd         = "";
 	rsInitConfig->debugLevel	= PQL_WARNING;
 	rsInitConfig->udpListenerOnly = false;
-	rsInitConfig->opModeStr = std::string("FULL");
+	rsInitConfig->opModeStr = std::string("");
 
 	/* setup the homePath (default save location) */
 	//	rsInitConfig->homePath = getHomePath();
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index e5d9430ce..cc08d4954 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -1489,7 +1489,7 @@ void MainWindow::processLastArgs()
 			opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1);
 		} else if (opmode == "minimal") {
 			opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1);
-		} else {
+		} else if (opmode != "") {
 			opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1);
 		}
 		opModeStatus->setOpMode();