diff --git a/lib.go b/lib.go
index 9d1feea..1156871 100644
--- a/lib.go
+++ b/lib.go
@@ -1018,7 +1018,6 @@ func CreateServer(password string, description string, autostart bool) {
 			s.SetAttribute(server.AttrDescription, description)
 			if autostart {
 				s.SetAttribute(server.AttrAutostart, "true")
-				LaunchServer(s.Onion())
 			} else {
 				s.SetAttribute(server.AttrAutostart, "false")
 			}
@@ -1032,6 +1031,9 @@ func CreateServer(password string, description string, autostart bool) {
 			ev := event.NewEvent(servers.NewServer, make(map[event.Field]string))
 			serverInfo.EnrichEvent(&ev)
 			application.GetPrimaryBus().Publish(ev)
+			if autostart {
+				LaunchServer(s.Onion())
+			}
 		}
 	}
 }