diff --git a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWsAgentModule.java b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWsAgentModule.java
index 79faeb9f2b2..1b9b260e3bc 100644
--- a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWsAgentModule.java
+++ b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/CheWsAgentModule.java
@@ -13,8 +13,6 @@
 import com.google.inject.AbstractModule;
 import com.google.inject.name.Names;
 import java.net.URI;
-import java.security.PublicKey;
-import org.eclipse.che.MachinePublicKeyProvider;
 import org.eclipse.che.MachineTokenProvider;
 import org.eclipse.che.UriApiEndpointProvider;
 import org.eclipse.che.inject.DynaModule;
@@ -40,10 +38,6 @@ protected void configure() {
         .annotatedWith(Names.named("wsagent.endpoint"))
         .toProvider(WsAgentURLProvider.class);
 
-    bind(PublicKey.class)
-        .annotatedWith(Names.named("signature.public.key"))
-        .toProvider(MachinePublicKeyProvider.class);
-
     bind(AppStateService.class);
   }
 }
diff --git a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentAuthModule.java b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentAuthModule.java
index f4018843249..fd300a5df15 100644
--- a/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentAuthModule.java
+++ b/wsagent/che-wsagent-core/src/main/java/org/eclipse/che/wsagent/server/WsAgentAuthModule.java
@@ -11,6 +11,9 @@
 package org.eclipse.che.wsagent.server;
 
 import com.google.inject.AbstractModule;
+import com.google.inject.name.Names;
+import java.security.PublicKey;
+import org.eclipse.che.MachinePublicKeyProvider;
 import org.eclipse.che.api.core.rest.HttpJsonRequestFactory;
 import org.eclipse.che.commons.auth.token.ChainedTokenExtractor;
 import org.eclipse.che.commons.auth.token.RequestTokenExtractor;
@@ -29,5 +32,8 @@ protected void configure() {
   private void configureMultiUserMode() {
     bind(HttpJsonRequestFactory.class).to(AgentHttpJsonRequestFactory.class);
     bind(RequestTokenExtractor.class).to(ChainedTokenExtractor.class);
+    bind(PublicKey.class)
+        .annotatedWith(Names.named("signature.public.key"))
+        .toProvider(MachinePublicKeyProvider.class);
   }
 }