diff --git a/evennia/server/deprecations.py b/evennia/server/deprecations.py
index a9f83dedeb..643f02afdc 100644
--- a/evennia/server/deprecations.py
+++ b/evennia/server/deprecations.py
@@ -112,6 +112,11 @@ def check_errors(settings):
     if hasattr(settings, "GAME_DIRECTORY_LISTING"):
         raise DeprecationWarning(game_directory_deprecation)
 
+    if hasattr(settings, "AMP_ENABLED"):
+        raise DeprecationWarning(
+            "AMP_ENABLED option is no longer supported. Remove it from your settings."
+        )
+
     chan_connectinfo = settings.CHANNEL_CONNECTINFO
     if chan_connectinfo is not None and not isinstance(chan_connectinfo, dict):
         raise DeprecationWarning(
diff --git a/evennia/server/service.py b/evennia/server/service.py
index 128ef5a157..c8b3e5a37f 100644
--- a/evennia/server/service.py
+++ b/evennia/server/service.py
@@ -152,8 +152,7 @@ class EvenniaServerService(MultiService):
         except OperationalError:
             print("Server server_starting_mode couldn't be set - database not set up.")
 
-        if settings.AMP_ENABLED:
-            self.register_amp()
+        self.register_amp()
 
         if settings.WEBSERVER_ENABLED:
             self.register_webserver()
@@ -483,7 +482,7 @@ class EvenniaServerService(MultiService):
 
         # initialize and start global scripts
         evennia.GLOBAL_SCRIPTS.start()
-    
+
     @defer.inlineCallbacks
     def shutdown(self, mode="reload", _reactor_stopping=False):
         """
diff --git a/evennia/settings_default.py b/evennia/settings_default.py
index cda7167e3f..9dd33975b9 100644
--- a/evennia/settings_default.py
+++ b/evennia/settings_default.py
@@ -128,7 +128,6 @@ EVENNIA_ADMIN = True
 # operating between two processes on the same machine. You usually don't need to
 # change this unless you cannot use the default AMP port/host for
 # whatever reason.
-AMP_ENABLED = True
 AMP_HOST = "localhost"
 AMP_PORT = 4006
 AMP_INTERFACE = "127.0.0.1"