diff --git a/cli/server/remove.go b/cli/server/remove.go
index b58b7e0b..976e14ed 100644
--- a/cli/server/remove.go
+++ b/cli/server/remove.go
@@ -128,6 +128,22 @@ like tears in rain.
 			logrus.Fatal(err)
 		}
 
+		if !rmServer {
+			logrus.Warn("did not pass -s/--server for actual server deletion, prompting")
+
+			response := false
+			prompt := &survey.Confirm{
+				Message: "are you sure there is no server to delete?",
+			}
+			if err := survey.AskOne(prompt, &response); err != nil {
+				logrus.Fatal(err)
+			}
+			if response {
+				logrus.Info("setting -s/--server and attempting to remove actual server")
+				rmServer = true
+			}
+		}
+
 		if rmServer {
 			if err := internal.EnsureServerProvider(); err != nil {
 				logrus.Fatal(err)