diff --git a/es-app/src/views/ViewController.cpp b/es-app/src/views/ViewController.cpp
index 81626cba6..0d81471ea 100644
--- a/es-app/src/views/ViewController.cpp
+++ b/es-app/src/views/ViewController.cpp
@@ -56,6 +56,9 @@ void ViewController::goToStart()
 				return;
 			}
 		}
+
+		// Requested system doesn't exist
+		Settings::getInstance()->setString("StartupSystem", "");
 	}
 	goToSystemView(SystemData::sSystemVector.at(0));
 }