diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 037681853..8dde3643f 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -239,8 +239,12 @@ int main(int argc, char *argv[])
 		splashScreen.hide();
 
 		Settings->setValue(QString::fromUtf8("FirstRun"), false);
+// This is now disabled - as it doesn't add very much.
+// Need to make sure that defaults are sensible!
+#ifdef ENABLE_QUICKSTART_WIZARD
 		QuickStartWizard qstartWizard;
 		qstartWizard.exec();
+#endif
 	}
 
 	MainWindow *w = MainWindow::Create ();