diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
index 27ca1cadd728..442fbfbb0b3b 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
@@ -31,6 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.GuiUtils;
 import com.intellij.ui.HyperlinkAdapter;
 import com.intellij.util.TimeoutUtil;
+import com.intellij.util.text.VersionComparatorUtil;
 import com.intellij.util.ui.UIUtil;
 import com.jetbrains.python.PythonHelper;
 import com.jetbrains.python.packaging.PyPackage;
@@ -311,6 +312,11 @@ public final class IpnbConnectionManager implements ProjectComponent {
       parameters.add("--port");
       parameters.add(hostPort.getSecond());
     }
+    final PyPackage notebookPackage = PyPackageUtil.findPackage(packages, "notebook");
+    if (notebookPackage != null && VersionComparatorUtil.compare(notebookPackage.getVersion(),
+                                                                 "4.3.0") >= 0) {
+      parameters.add("--NotebookApp.token=''");
+    }
     final String arguments = ipnbSettings.getArguments();
     if (!StringUtil.isEmptyOrSpaces(arguments)) {
       parameters.addAll(StringUtil.split(arguments, " "));
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
index 94b3dce8e480..91ba8fc79785 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbSettings.java
@@ -14,7 +14,7 @@ public class IpnbSettings implements PersistentStateComponent<IpnbSettings> {
   public static final String DEFAULT_URL = "http://127.0.0.1:8888";
   public String URL = DEFAULT_URL;
   private String myWorkingDirectory;
-  private String myArguments = "--NotebookApp.token=''";
+  private String myArguments = "";
 
   public static IpnbSettings getInstance(@NotNull Project project) {
     return ServiceManager.getService(project, IpnbSettings.class);