diff --git a/.gitmodules b/.gitmodules
index f79d0fabe..46c271b75 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -108,11 +108,6 @@
 	url = https://github.com/status-im/news.git
 	ignore = untracked
 	branch = status
-[submodule "vendor/nim-prompt"]
-	path = vendor/nim-prompt
-	url = https://github.com/status-im/nim-prompt.git
-	ignore = untracked
-	branch = master
 [submodule "vendor/nim-unicodedb"]
 	path = vendor/nim-unicodedb
 	url = https://github.com/nitely/nim-unicodedb.git
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index 26703724b..64117e5ca 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -52,9 +52,6 @@ from
 import
   TopicParams, validateParameters, init
 
-const
-  hasPrompt = false and not defined(withoutPrompt) # disabled, doesn't work
-
 type
   RpcServer* = RpcHttpServer
 
@@ -1502,38 +1499,6 @@ proc initStatusBar(node: BeaconNode) {.raises: [Defect, ValueError].} =
 
   asyncSpawn statusBarUpdatesPollingLoop()
 
-when hasPrompt:
-  # TODO: nim-prompt seems to have threading issues at the moment
-  #       which result in sporadic crashes. We should introduce a
-  #       lock that guards the access to the internal prompt line
-  #       variable.
-  #
-  # var p = Prompt.init("nimbus > ", providePromptCompletions)
-  # p.useHistoryFile()
-
-  from unicode import Rune
-  import prompt
-
-  func providePromptCompletions*(line: seq[Rune], cursorPos: int): seq[string] =
-    # TODO
-    # The completions should be generated with the general-purpose command-line
-    # parsing API of Confutils
-    result = @[]
-
-  proc processPromptCommands(p: ptr Prompt) {.thread.} =
-    while true:
-      var cmd = p[].readLine()
-      case cmd
-      of "quit":
-        quit 0
-      else:
-        p[].writeLine("Unknown command: " & cmd)
-
-  proc initPrompt(node: BeaconNode) =
-    # var t: Thread[ptr Prompt]
-    # createThread(t, processPromptCommands, addr p)
-    discard
-
 proc handleValidatorExitCommand(config: BeaconNodeConf) {.async.} =
   let port = try:
     let value = parseInt(config.rpcUrlForExit.port)
@@ -1732,9 +1697,6 @@ proc doRunBeaconNode(config: var BeaconNodeConf, rng: ref BrHmacDrbgContext) {.r
 
   initStatusBar(node)
 
-  when hasPrompt:
-    initPrompt(node)
-
   if node.nickname != "":
     dynamicLogScope(node = node.nickname): node.start()
   else:
diff --git a/beacon_chain/nimbus_beacon_node.nim.cfg b/beacon_chain/nimbus_beacon_node.nim.cfg
index 88e356aa5..0873e9ef5 100644
--- a/beacon_chain/nimbus_beacon_node.nim.cfg
+++ b/beacon_chain/nimbus_beacon_node.nim.cfg
@@ -7,5 +7,4 @@
 
 @if testnet_servers_image:
   -d:"chronicles_sinks=json"
-  -d:"withoutPrompt"
 @end
diff --git a/beacon_chain/nimbus_validator_client.nim.cfg b/beacon_chain/nimbus_validator_client.nim.cfg
index 3f239b32b..50920acfd 100644
--- a/beacon_chain/nimbus_validator_client.nim.cfg
+++ b/beacon_chain/nimbus_validator_client.nim.cfg
@@ -7,6 +7,5 @@
 
 @if testnet_servers_image:
   -d:"chronicles_sinks=json"
-  -d:"withoutPrompt"
 @end
 
diff --git a/tests/all_tests.nim.cfg b/tests/all_tests.nim.cfg
index dcf0acb60..e233b3ddc 100644
--- a/tests/all_tests.nim.cfg
+++ b/tests/all_tests.nim.cfg
@@ -1,7 +1,2 @@
-# TODO:
-# This prevents a strange build failure in nimbus_beacon_node.nim.
-# Investigate why it's needed.
--d:withoutPrompt
-
 # Use only `secp256k1` public key cryptography as an identity in LibP2P.
 -d:"libp2p_pki_schemes=secp256k1"
diff --git a/vendor/nim-prompt b/vendor/nim-prompt
deleted file mode 160000
index b0ea27c34..000000000
--- a/vendor/nim-prompt
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0ea27c34ca7aaee42333541f37b182fa239c844