Resolve "No matching state found in storage" error on first connection