diff --git a/database.go b/database.go
index 5bda60a..a564284 100644
--- a/database.go
+++ b/database.go
@@ -441,6 +441,10 @@ func (d *Database) GetTokenByCode(code string) (string, error) {
 		return "", errors.New("No such code")
 	}
 
+	delete(d.WaygatePendingTokens, code)
+
+	d.persist()
+
 	return token, nil
 }