diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
index 37635c1b7f55..0051603b9d21 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
@@ -416,7 +416,12 @@ public class IpnbConnection {
   }
 
   protected void shutdownKernel() throws IOException {
-    httpRequest(myURI + KERNELS_URL + "/" + myKernelId, HTTPMethod.DELETE.name());
+    if (myIsHubServer) {
+      httpRequest(myURI + USER_PATH + "/" + IpnbSettings.getInstance(myProject).getUsername() + KERNELS_URL + "/" + myKernelId,  HTTPMethod.DELETE.name());
+    }
+    else {
+      httpRequest(myURI + KERNELS_URL + "/" + myKernelId, HTTPMethod.DELETE.name());
+    }
   }
 
   public void interrupt() throws IOException {