diff --git a/Source/Contents/Configuration/ServiceOptions.cpp b/Source/Contents/Configuration/ServiceOptions.cpp
index 8deefeb0..0ac336b0 100644
--- a/Source/Contents/Configuration/ServiceOptions.cpp
+++ b/Source/Contents/Configuration/ServiceOptions.cpp
@@ -525,10 +525,10 @@ std::optional<GameSettingsOption*> GameSettings::FindOption(int id) {
   while (option != this->options.end() && id != option->id) {
     ++option;
   }
-  if (option == this->options.end()) {
-    return std::nullopt;
+  if (option != this->options.end()) {
+    return &*option;
   }
-  return &*option;
+  return std::nullopt;
 }
 
 // OFFSET: 0x006C1070