diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index 49e021748..4d7ccb1e9 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -5023,7 +5023,8 @@ public class I2PSnarkServlet extends BasicServlet {
         if (session == null) {
             return "FAIL_SESSION_NOT_SET";
         }
-        String rv;
+        // add a prefix to distinguish from other nonces for debugging
+        String rv = "SN" + (xhr ? 'B' : 'A') + _context.random().nextLong();
         String att = xhr ? SESSION_SNARK_NONCE2 : SESSION_SNARK_NONCE1;
         synchronized(session) {
             LinkedList<String> nonces = (LinkedList<String>) session.getAttribute(att);
@@ -5031,8 +5032,6 @@ public class I2PSnarkServlet extends BasicServlet {
                 nonces = new LinkedList<String>();
                 session.setAttribute(att, nonces);
             }
-            // add a prefix to distinguish from other nonces for debugging
-            rv = "SN" + (xhr ? 'B' : 'A') + _context.random().nextLong();
             nonces.offer(rv);
             if (nonces.size() > NONCE_QUEUE_SIZE)
                 nonces.poll();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index 4c303a666..6d22da5ed 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -128,15 +128,14 @@ public class IndexBean {
         if (_session == null) {
             return "FAIL_SESSION_NOT_SET";
         }
-        String rv;
+        // add a prefix to distinguish from other nonces for debugging
+        String rv = "HSM" + _context.random().nextLong();
         synchronized(_session) {
             LinkedList<String> nonces = (LinkedList<String>) _session.getAttribute(SESSION_I2PTUNNEL_NONCE);
             if (nonces == null) {
                 nonces = new LinkedList<String>();
                 _session.setAttribute(SESSION_I2PTUNNEL_NONCE, nonces);
             }
-            // add a prefix to distinguish from other nonces for debugging
-            rv = "HSM" + _context.random().nextLong();
             nonces.offer(rv);
             if (nonces.size() > MAX_NONCES)
                 nonces.poll();
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index aa7842618..c830a40fc 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -55,15 +55,14 @@ public class CSSHelper extends HelperBase {
             //I2PAppContext.getGlobalContext().logManager().getLog(CSSHelper.class).error("getNonce() null session", new Exception());
             return "FAIL_SESSION_NOT_SET";
         }
-        String rv;
+        // add a prefix to distinguish from other nonces for debugging
+        String rv = "CN" + RandomSource.getInstance().nextLong();
         synchronized(session) {
             LinkedList<String> nonces = (LinkedList<String>) session.getAttribute(SESSION_CONSOLE_NONCE);
             if (nonces == null) {
                 nonces = new LinkedList<String>();
                 session.setAttribute(SESSION_CONSOLE_NONCE, nonces);
             }
-            // add a prefix to distinguish from other nonces for debugging
-            rv = "CN" + RandomSource.getInstance().nextLong();
             nonces.offer(rv);
             if (nonces.size() > NONCE_QUEUE_SIZE)
                 nonces.poll();