diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
index 438265977..d2315e514 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/QuickConnectUserContext.java
@@ -114,7 +114,7 @@ public class QuickConnectUserContext extends AbstractUserContext {
 
     @Override
     public Object getResource() throws GuacamoleException {
-        return new QuickConnectREST(this);
+        return new QuickConnectREST(connectionDirectory);
     }
 
     @Override
diff --git a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
index 48dec4c63..4b0b9fd1e 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
+++ b/extensions/guacamole-auth-quickconnect/src/main/java/org/apache/guacamole/auth/quickconnect/rest/QuickConnectREST.java
@@ -26,7 +26,6 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.auth.quickconnect.QuickConnectDirectory;
-import org.apache.guacamole.auth.quickconnect.QuickConnectUserContext;
 import org.apache.guacamole.auth.quickconnect.utility.QCParser;
 
 /**
@@ -41,26 +40,20 @@ public class QuickConnectREST {
      */
     private QuickConnectDirectory directory;
 
-    /**
-     * The UserContext object for this REST endpoint.
-     */
-    private QuickConnectUserContext userContext;
-
     /**
      * Construct a new QuickConnectREST class, taking in the UserContext
      * object that calls this constructor.
      *
-     * @param userContext
-     *     The UserContext object associated with this REST endpoint
+     * @param directory
+     *     The ConnectionDirectory object associated with this REST endpoint
      *
      * @throws GuacamoleException
      *     If the UserContext is unavailable or the directory object
      *     cannot be retrieved.
      */
-    public QuickConnectREST(QuickConnectUserContext userContext)
+    public QuickConnectREST(QuickConnectDirectory directory)
             throws GuacamoleException {
-        this.userContext = userContext;
-        this.directory = this.userContext.getConnectionDirectory();
+        this.directory = directory;
     }
 
     /**