diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97e5f5b920e..1c64e30e43c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 
 ### Added
 
+- We added the option to enable the language server in the preferences. [#13697](https://github.com/JabRef/jabref/pull/13697)
 - We introduced an option in Preferences under (under Linked files -> Linked file name conventions) to automatically rename linked files when an entry data changes. [#11316](https://github.com/JabRef/jabref/issues/11316)
 - We added tooltips (on hover) for 'Library-specific file directory', 'User-specific file directory' and 'LaTeX file directory' fields of the library properties window. [#12269](https://github.com/JabRef/jabref/issues/12269)
 - A space is now added by default after citations inserted via the Libre/OpenOffice integration. [#13559](https://github.com/JabRef/jabref/issues/13559)
diff --git a/jabgui/build.gradle.kts b/jabgui/build.gradle.kts
index d8762e73053..2e14ae5af1d 100644
--- a/jabgui/build.gradle.kts
+++ b/jabgui/build.gradle.kts
@@ -20,11 +20,12 @@ dependencies {
     // implementation("org.openjfx:javafx-fxml")
     // implementation("org.openjfx:javafx-graphics")
 
+    implementation(project(":jabls"))
+    implementation(project(":jabsrv"))
+
     implementation("org.openjfx:javafx-swing")
     implementation("org.openjfx:javafx-web")
 
-    implementation(project(":jabsrv"))
-
     implementation("com.pixelduke:fxthemes")
 
     // From JavaFX25 onwards
diff --git a/jabgui/src/main/java/module-info.java b/jabgui/src/main/java/module-info.java
index 5b62ad2acc4..09b87d8b53f 100644
--- a/jabgui/src/main/java/module-info.java
+++ b/jabgui/src/main/java/module-info.java
@@ -1,6 +1,6 @@
 open module org.jabref {
     requires org.jabref.jablib;
-
+    requires org.jabref.jabls;
     requires org.jabref.jabsrv;
 
     // Swing
diff --git a/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java b/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
index 9e3448c2ac3..47e191d7b80 100644
--- a/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
+++ b/jabgui/src/main/java/org/jabref/gui/JabRefGUI.java
@@ -33,6 +33,7 @@
 import org.jabref.gui.util.UiTaskExecutor;
 import org.jabref.gui.util.WebViewStore;
 import org.jabref.http.manager.HttpServerManager;
+import org.jabref.languageserver.controller.LanguageServerController;
 import org.jabref.logic.UiCommand;
 import org.jabref.logic.ai.AiService;
 import org.jabref.logic.citation.SearchCitationsRelationsService;
@@ -86,6 +87,7 @@ public class JabRefGUI extends Application {
 
     private static RemoteListenerServerManager remoteListenerServerManager;
     private static HttpServerManager httpServerManager;
+    private static LanguageServerController languageServerController;
 
     private Stage mainStage;
 
@@ -156,8 +158,9 @@ public void initialize() {
         Injector.setModelOrService(DirectoryMonitor.class, directoryMonitor);
 
         BibEntryTypesManager entryTypesManager = preferences.getCustomEntryTypesRepository();
+        JournalAbbreviationRepository journalAbbreviationRepository = JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences());
         Injector.setModelOrService(BibEntryTypesManager.class, entryTypesManager);
-        Injector.setModelOrService(JournalAbbreviationRepository.class, JournalAbbreviationLoader.loadRepository(preferences.getJournalAbbreviationPreferences()));
+        Injector.setModelOrService(JournalAbbreviationRepository.class, journalAbbreviationRepository);
         Injector.setModelOrService(ProtectedTermsLoader.class, new ProtectedTermsLoader(preferences.getProtectedTermsPreferences()));
 
         IndexManager.clearOldSearchIndices();
@@ -168,6 +171,9 @@ public void initialize() {
         JabRefGUI.httpServerManager = new HttpServerManager();
         Injector.setModelOrService(HttpServerManager.class, JabRefGUI.httpServerManager);
 
+        JabRefGUI.languageServerController = new LanguageServerController(preferences, journalAbbreviationRepository);
+        Injector.setModelOrService(LanguageServerController.class, JabRefGUI.languageServerController);
+
         JabRefGUI.stateManager = new JabRefGuiStateManager();
         Injector.setModelOrService(StateManager.class, stateManager);
 
@@ -424,6 +430,9 @@ public void startBackgroundTasks() {
         if (remotePreferences.enableHttpServer()) {
             httpServerManager.start(stateManager, remotePreferences.getHttpServerUri());
         }
+        if (remotePreferences.enableLanguageServer()) {
+            languageServerController.start(remotePreferences.getLanguageServerPort());
+        }
     }
 
     @Override
@@ -467,6 +476,12 @@ public void stop() {
                 LOGGER.trace("HttpServerManager shut down");
             });
 
+            executor.submit(() -> {
+                LOGGER.trace("Shutting down language server controller");
+                languageServerController.stop();
+                LOGGER.trace("LanguageServerController shut down");
+            });
+
             executor.submit(() -> {
                 LOGGER.trace("Stopping background tasks");
                 Unirest.shutDown();
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
index 6a63aa72282..50b3023808a 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTab.java
@@ -60,6 +60,8 @@ public class GeneralTab extends AbstractPreferenceTabView<GeneralTabViewModel> i
     @FXML private TextField remotePort;
     @FXML private CheckBox enableHttpServer;
     @FXML private TextField httpServerPort;
+    @FXML private CheckBox enableLanguageServer;
+    @FXML private TextField languageServerPort;
     @FXML private Button remoteHelp;
     @Inject private FileUpdateMonitor fileUpdateMonitor;
     @Inject private BibEntryTypesManager entryTypesManager;
@@ -147,6 +149,7 @@ public void initialize() {
         Platform.runLater(() -> {
             validationVisualizer.initVisualization(viewModel.remotePortValidationStatus(), remotePort);
             validationVisualizer.initVisualization(viewModel.httpPortValidationStatus(), httpServerPort);
+            validationVisualizer.initVisualization(viewModel.languageServerPortValidationStatus(), languageServerPort);
             validationVisualizer.initVisualization(viewModel.fontSizeValidationStatus(), fontSize);
             validationVisualizer.initVisualization(viewModel.customPathToThemeValidationStatus(), customThemePath);
         });
@@ -158,6 +161,10 @@ public void initialize() {
         enableHttpServer.selectedProperty().bindBidirectional(viewModel.enableHttpServerProperty());
         httpServerPort.textProperty().bindBidirectional(viewModel.httpPortProperty());
         httpServerPort.disableProperty().bind(enableHttpServer.selectedProperty().not());
+
+        enableLanguageServer.selectedProperty().bindBidirectional(viewModel.enableLanguageServerProperty());
+        languageServerPort.textProperty().bindBidirectional(viewModel.languageServerPortProperty());
+        languageServerPort.disableProperty().bind(enableLanguageServer.selectedProperty().not());
     }
 
     @FXML
diff --git a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
index beb2b7be4e2..04b34be5b60 100644
--- a/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
+++ b/jabgui/src/main/java/org/jabref/gui/preferences/general/GeneralTabViewModel.java
@@ -33,6 +33,7 @@
 import org.jabref.gui.util.DirectoryDialogConfiguration;
 import org.jabref.gui.util.FileDialogConfiguration;
 import org.jabref.http.manager.HttpServerManager;
+import org.jabref.languageserver.controller.LanguageServerController;
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.l10n.Language;
@@ -112,6 +113,9 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty enableHttpServerProperty = new SimpleBooleanProperty();
     private final StringProperty httpPortProperty = new SimpleStringProperty("");
     private final Validator httpPortValidator;
+    private final Validator languageServerPortValidator;
+    private final BooleanProperty enableLanguageServerProperty = new SimpleBooleanProperty();
+    private final StringProperty languageServerPortProperty = new SimpleStringProperty("");
     private final TrustStoreManager trustStoreManager;
 
     private final FileUpdateMonitor fileUpdateMonitor;
@@ -149,29 +153,22 @@ public GeneralTabViewModel(DialogService dialogService, GuiPreferences preferenc
 
         remotePortValidator = new FunctionBasedValidator<>(
                 remotePortProperty,
-                input -> {
-                    try {
-                        int portNumber = Integer.parseInt(remotePortProperty().getValue());
-                        return RemoteUtil.isUserPort(portNumber);
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
+                RemoteUtil::isStringUserPort,
                 ValidationMessage.error("%s > %s %n %n %s".formatted(
                         Localization.lang("Network"),
                         Localization.lang("Remote operation"),
                         Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+
         httpPortValidator = new FunctionBasedValidator<>(
                 httpPortProperty,
-                input -> {
-                    try {
-                        int portNumber = Integer.parseInt(httpPortProperty().getValue());
-                        return RemoteUtil.isUserPort(portNumber);
-                    } catch (NumberFormatException ex) {
-                        return false;
-                    }
-                },
+                RemoteUtil::isStringUserPort,
                 ValidationMessage.error("%s".formatted(Localization.lang("You must enter an integer value in the interval 1025-65535"))));
+
+        languageServerPortValidator = new FunctionBasedValidator<>(
+                languageServerPortProperty,
+                RemoteUtil::isStringUserPort,
+                ValidationMessage.error(Localization.lang("You must enter an integer value in the interval 1025-65535")));
+
         this.trustStoreManager = new TrustStoreManager(Path.of(preferences.getSSLPreferences().getTruststorePath()));
     }
 
@@ -183,6 +180,10 @@ public ValidationStatus httpPortValidationStatus() {
         return httpPortValidator.getValidationStatus();
     }
 
+    public ValidationStatus languageServerPortValidationStatus() {
+        return languageServerPortValidator.getValidationStatus();
+    }
+
     @Override
     public void setValues() {
         selectedLanguageProperty.setValue(workspacePreferences.getLanguage());
@@ -227,6 +228,9 @@ public void setValues() {
 
         enableHttpServerProperty.setValue(remotePreferences.enableHttpServer());
         httpPortProperty.setValue(String.valueOf(remotePreferences.getHttpPort()));
+
+        enableLanguageServerProperty.setValue(remotePreferences.enableLanguageServer());
+        languageServerPortProperty.setValue(String.valueOf(remotePreferences.getLanguageServerPort()));
     }
 
     @Override
@@ -300,6 +304,12 @@ public void storeSettings() {
             }
         });
 
+        getPortAsInt(languageServerPortProperty.getValue()).ifPresent(newPort -> {
+            if (remotePreferences.isDifferentLanguageServerPort(newPort)) {
+                remotePreferences.setLanguageServerPort(newPort);
+            }
+        });
+
         HttpServerManager httpServerManager = Injector.instantiateModelOrService(HttpServerManager.class);
         // stop in all cases, because the port might have changed
         httpServerManager.stop();
@@ -312,6 +322,17 @@ public void storeSettings() {
             httpServerManager.stop();
         }
 
+        LanguageServerController languageServerController = Injector.instantiateModelOrService(LanguageServerController.class);
+        // stop in all cases, because the port might have changed (or other settings that can't be easily tracked https://github.com/JabRef/jabref/pull/13697#discussion_r2285997003)
+        languageServerController.stop();
+        if (enableLanguageServerProperty.getValue()) {
+            remotePreferences.setEnableLanguageServer(true);
+            languageServerController.start(remotePreferences.getLanguageServerPort());
+        } else {
+            remotePreferences.setEnableLanguageServer(false);
+            languageServerController.stop();
+        }
+
         trustStoreManager.flush();
     }
 
@@ -335,6 +356,10 @@ public boolean validateSettings() {
             validator.addValidators(httpPortValidator);
         }
 
+        if (enableLanguageServerProperty.getValue()) {
+            validator.addValidators(languageServerPortValidator);
+        }
+
         if (fontOverrideProperty.getValue()) {
             validator.addValidators(fontSizeValidator);
         }
@@ -477,6 +502,14 @@ public StringProperty httpPortProperty() {
         return httpPortProperty;
     }
 
+    public BooleanProperty enableLanguageServerProperty() {
+        return enableLanguageServerProperty;
+    }
+
+    public StringProperty languageServerPortProperty() {
+        return languageServerPortProperty;
+    }
+
     public void openBrowser() {
         String url = "https://themes.jabref.org";
         try {
diff --git a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
index d3b67bea682..6a4f71c5a36 100644
--- a/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
+++ b/jabgui/src/main/resources/org/jabref/gui/preferences/general/GeneralTab.fxml
@@ -89,6 +89,12 @@
         <TextField fx:id="httpServerPort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
     </HBox>
 
+    <Label styleClass="sectionHeader" text="%Language Server" />
+    <HBox alignment="CENTER_LEFT" spacing="10.0">
+        <CheckBox fx:id="enableLanguageServer" text="%Enable Language Server on port" />
+        <TextField fx:id="languageServerPort" maxWidth="100.0" HBox.hgrow="ALWAYS" />
+    </HBox>
+
     <Label styleClass="sectionHeader" text="%Libraries"/>
     <GridPane hgap="10.0" vgap="4.0">
         <columnConstraints>
diff --git a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index d76af5adc5d..2488fb4a5c0 100644
--- a/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -374,6 +374,8 @@ public class JabRefCliPreferences implements CliPreferences {
     private static final String REMOTE_SERVER_PORT = "remoteServerPort";
     private static final String HTTP_SERVER_PORT = "httpServerPort";
     private static final String ENABLE_HTTP_SERVER = "enableHttpServer";
+    private static final String ENABLE_LANGUAGE_SERVER = "enableLanguageServer";
+    private static final String LANGUAGE_SERVER_PORT = "languageServerPort";
 
     private static final String AI_ENABLED = "aiEnabled";
     private static final String AI_AUTO_GENERATE_EMBEDDINGS = "aiAutoGenerateEmbeddings";
@@ -673,6 +675,8 @@ public JabRefCliPreferences() {
         defaults.put(REMOTE_SERVER_PORT, 6050);
         defaults.put(ENABLE_HTTP_SERVER, Boolean.FALSE);
         defaults.put(HTTP_SERVER_PORT, 23119);
+        defaults.put(ENABLE_LANGUAGE_SERVER, Boolean.FALSE);
+        defaults.put(LANGUAGE_SERVER_PORT, 2087);
 
         defaults.put(EXTERNAL_JOURNAL_LISTS, "");
         defaults.put(USE_AMS_FJOURNAL, true);
@@ -1384,12 +1388,16 @@ public RemotePreferences getRemotePreferences() {
                 getInt(REMOTE_SERVER_PORT),
                 getBoolean(USE_REMOTE_SERVER),
                 getInt(HTTP_SERVER_PORT),
-                getBoolean(ENABLE_HTTP_SERVER));
+                getBoolean(ENABLE_HTTP_SERVER),
+                getBoolean(ENABLE_LANGUAGE_SERVER),
+                getInt(LANGUAGE_SERVER_PORT));
 
         EasyBind.listen(remotePreferences.portProperty(), (_, _, newValue) -> putInt(REMOTE_SERVER_PORT, newValue));
         EasyBind.listen(remotePreferences.useRemoteServerProperty(), (_, _, newValue) -> putBoolean(USE_REMOTE_SERVER, newValue));
         EasyBind.listen(remotePreferences.httpPortProperty(), (_, _, newValue) -> putInt(HTTP_SERVER_PORT, newValue));
         EasyBind.listen(remotePreferences.enableHttpServerProperty(), (_, _, newValue) -> putBoolean(ENABLE_HTTP_SERVER, newValue));
+        EasyBind.listen(remotePreferences.languageServerPortProperty(), (_, _, newValue) -> putInt(LANGUAGE_SERVER_PORT, newValue));
+        EasyBind.listen(remotePreferences.enableLanguageServerProperty(), (_, _, newValue) -> putBoolean(ENABLE_LANGUAGE_SERVER, newValue));
 
         return remotePreferences;
     }
diff --git a/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java b/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
index cb228f327e6..72eeb9f9dbc 100644
--- a/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
+++ b/jablib/src/main/java/org/jabref/logic/remote/RemotePreferences.java
@@ -27,11 +27,16 @@ public class RemotePreferences {
     private final IntegerProperty httpPort;
     private final BooleanProperty enableHttpServer;
 
-    public RemotePreferences(int port, boolean useRemoteServer, int httpPort, boolean enableHttpServer) {
+    private final BooleanProperty enableLanguageServer;
+    private final IntegerProperty languageServerPort;
+
+    public RemotePreferences(int port, boolean useRemoteServer, int httpPort, boolean enableHttpServer, boolean enableLanguageServer, int languageServerPort) {
         this.port = new SimpleIntegerProperty(port);
         this.useRemoteServer = new SimpleBooleanProperty(useRemoteServer);
         this.httpPort = new SimpleIntegerProperty(httpPort);
         this.enableHttpServer = new SimpleBooleanProperty(enableHttpServer);
+        this.enableLanguageServer = new SimpleBooleanProperty(enableLanguageServer);
+        this.languageServerPort = new SimpleIntegerProperty(languageServerPort);
     }
 
     public int getPort() {
@@ -90,6 +95,34 @@ public void setEnableHttpServer(boolean enableHttpServer) {
         this.enableHttpServer.setValue(enableHttpServer);
     }
 
+    public int getLanguageServerPort() {
+        return languageServerPort.getValue();
+    }
+
+    public IntegerProperty languageServerPortProperty() {
+        return languageServerPort;
+    }
+
+    public void setLanguageServerPort(int languageServerPort) {
+        this.languageServerPort.setValue(languageServerPort);
+    }
+
+    public boolean isDifferentLanguageServerPort(int otherLanguageServerPort) {
+        return getLanguageServerPort() != otherLanguageServerPort;
+    }
+
+    public boolean enableLanguageServer() {
+        return enableLanguageServer.getValue();
+    }
+
+    public BooleanProperty enableLanguageServerProperty() {
+        return enableLanguageServer;
+    }
+
+    public void setEnableLanguageServer(boolean enableLanguageServer) {
+        this.enableLanguageServer.setValue(enableLanguageServer);
+    }
+
     /// Gets the IP address where both the remote server and the http server are listening.
     public static InetAddress getIpAddress() throws UnknownHostException {
         return InetAddress.getByName("localhost");
diff --git a/jablib/src/main/java/org/jabref/logic/remote/RemoteUtil.java b/jablib/src/main/java/org/jabref/logic/remote/RemoteUtil.java
index 66e3a543c65..964b372f207 100644
--- a/jablib/src/main/java/org/jabref/logic/remote/RemoteUtil.java
+++ b/jablib/src/main/java/org/jabref/logic/remote/RemoteUtil.java
@@ -8,4 +8,13 @@ private RemoteUtil() {
     public static boolean isUserPort(int portNumber) {
         return (portNumber >= 1024) && (portNumber <= 65535);
     }
+
+    public static boolean isStringUserPort(String portString) {
+        try {
+            int portNumber = Integer.parseInt(portString);
+            return isUserPort(portNumber);
+        } catch (NumberFormatException e) {
+            return false;
+        }
+    }
 }
diff --git a/jablib/src/main/resources/l10n/JabRef_en.properties b/jablib/src/main/resources/l10n/JabRef_en.properties
index 653ef6f5e1f..0473ea5ff3b 100644
--- a/jablib/src/main/resources/l10n/JabRef_en.properties
+++ b/jablib/src/main/resources/l10n/JabRef_en.properties
@@ -1823,6 +1823,7 @@ Connect=Connect
 Connection\ error=Connection error
 Connection\ to\ %0\ server\ established.=Connection to %0 server established.
 Required\ field\ "%0"\ is\ empty.=Required field "%0" is empty.
+Optional\ field\ "%0"\ is\ empty.=Optional field "%0" is empty.
 %0\ driver\ not\ available.=%0 driver not available.
 The\ connection\ to\ the\ server\ has\ been\ terminated.=The connection to the server has been terminated.
 Reconnect=Reconnect
@@ -1857,6 +1858,9 @@ Cannot\ use\ port\ %0\ for\ remote\ operation;\ another\ application\ may\ be\ u
 Enable\ HTTP\ Server\ (e.g.,\ for\ JabMap)\ on\ port=Enable HTTP Server (e.g., for JabMap) on port
 HTTP\ Server=HTTP Server
 
+Enable\ Language\ Server\ on\ port=Enable Language Server on port
+Language\ Server=Language Server
+
 Grobid\ URL=Grobid URL
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
 Send\ to\ Grobid=Send to Grobid
diff --git a/jablib/src/test/java/org/jabref/logic/l10n/LocalizationParser.java b/jablib/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
index 076fb63ea0d..5f1b541f17b 100644
--- a/jablib/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
+++ b/jablib/src/test/java/org/jabref/logic/l10n/LocalizationParser.java
@@ -90,7 +90,7 @@ public static Set<LocalizationEntry> findLocalizationParametersStringsInJavaFile
 
     private static Set<LocalizationEntry> findLocalizationEntriesInJavaFiles(LocalizationBundleForTest type) throws IOException {
         try {
-            return List.of("jablib", "jabkit", "jabsrv", "jabgui")
+            return List.of("jablib", "jabkit", "jabsrv", "jabgui", "jabls")
                        .stream()
                        .map(path -> Path.of("..", path, "src", "main", "java").normalize())
                        .flatMap(Unchecked.function(path -> Files.walk(path)))
@@ -104,7 +104,7 @@ private static Set<LocalizationEntry> findLocalizationEntriesInJavaFiles(Localiz
 
     private static Set<LocalizationEntry> findLocalizationEntriesInFxmlFiles(LocalizationBundleForTest type) throws IOException {
         try {
-            return List.of("jablib", "jabkit", "jabsrv", "jabgui")
+            return List.of("jablib", "jabkit", "jabsrv", "jabgui", "jabls")
                        .stream()
                        .map(path -> Path.of("..", path, "src", "main", "resources").normalize())
                        .filter(Files::isDirectory)
diff --git a/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java b/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
index ad0c8a0e70c..d33626f3696 100644
--- a/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
+++ b/jablib/src/test/java/org/jabref/logic/remote/RemotePreferencesTest.java
@@ -13,7 +13,7 @@ class RemotePreferencesTest {
 
     @BeforeEach
     void setUp() {
-        preferences = new RemotePreferences(1000, true, 3000, false);
+        preferences = new RemotePreferences(1000, true, 3000, false, false, 2087);
     }
 
     @Test
diff --git a/jabls-cli/src/main/java/org/jabref/languageserver/cli/ServerCli.java b/jabls-cli/src/main/java/org/jabref/languageserver/cli/ServerCli.java
index e55c084d411..b1a7515d3db 100644
--- a/jabls-cli/src/main/java/org/jabref/languageserver/cli/ServerCli.java
+++ b/jabls-cli/src/main/java/org/jabref/languageserver/cli/ServerCli.java
@@ -3,7 +3,7 @@
 import java.util.concurrent.Callable;
 
 import org.jabref.architecture.AllowedToUseStandardStreams;
-import org.jabref.languageserver.LSPLauncher;
+import org.jabref.languageserver.LspLauncher;
 import org.jabref.logic.preferences.JabRefCliPreferences;
 
 import org.slf4j.Logger;
@@ -16,6 +16,9 @@
 public class ServerCli implements Callable<Void> {
     private static final Logger LOGGER = LoggerFactory.getLogger(ServerCli.class);
 
+    @CommandLine.Option(names = {"-p", "--port"}, description = "the port")
+    private Integer port = 2087;
+
     public static void main(final String[] args) throws InterruptedException {
         SLF4JBridgeHandler.removeHandlersForRootLogger();
         SLF4JBridgeHandler.install();
@@ -25,8 +28,8 @@ public static void main(final String[] args) throws InterruptedException {
 
     @Override
     public Void call() throws InterruptedException {
-        LSPLauncher lspLauncher = new LSPLauncher();
-        lspLauncher.run(JabRefCliPreferences.getInstance());
+        LspLauncher lspLauncher = new LspLauncher(JabRefCliPreferences.getInstance(), port);
+        lspLauncher.run();
 
         // Keep the server running until user kills the process (e.g., presses Ctrl+C)
         Thread.currentThread().join();
diff --git a/jabls-cli/src/main/resources/tinylog.properties b/jabls-cli/src/main/resources/tinylog.properties
index c10c6ac62fd..28f5cdc77b3 100644
--- a/jabls-cli/src/main/resources/tinylog.properties
+++ b/jabls-cli/src/main/resources/tinylog.properties
@@ -4,8 +4,8 @@ writerConsole = console
 # More shrunk exception logs. See https://tinylog.org/v2/configuration/#strip-stack-trace-elements for details
 exception = strip: jdk.internal
 
-level@org.jabref.languageserver.LSPLauncher = debug
-level@org.jabref.languageserver.cli.ServerCli = debug
+level@org.jabref.languageserver = debug
+level@org.jabref.languageserver.util = debug
 
 level@org.apache.pdfbox.pdmodel.font = error
 level@org.apache.pdfbox.pdmodel.PDSimpleFont = error
diff --git a/jabls/src/main/java/module-info.java b/jabls/src/main/java/module-info.java
index 1d16730351d..aa072e5194e 100644
--- a/jabls/src/main/java/module-info.java
+++ b/jabls/src/main/java/module-info.java
@@ -1,6 +1,8 @@
 module org.jabref.jabls {
     exports org.jabref.languageserver;
-    opens org.jabref.languageserver to lsp4j, lsp4j.jsonrpc;
+    opens org.jabref.languageserver to lsp4j, lsp4j.jsonrpc, com.google.gson;
+    exports org.jabref.languageserver.controller;
+    exports org.jabref.languageserver.util;
 
     requires org.jabref.jablib;
 
@@ -9,5 +11,5 @@
     requires lsp4j;
     requires lsp4j.jsonrpc;
     requires lsp4j.websocket;
-    requires lsp4j.websocket.jakarta;
+    requires com.google.gson;
 }
diff --git a/jabls/src/main/java/org/jabref/languageserver/BibtexTextDocumentService.java b/jabls/src/main/java/org/jabref/languageserver/BibtexTextDocumentService.java
index bd1c7771a9d..10cd45abb1a 100644
--- a/jabls/src/main/java/org/jabref/languageserver/BibtexTextDocumentService.java
+++ b/jabls/src/main/java/org/jabref/languageserver/BibtexTextDocumentService.java
@@ -1,39 +1,30 @@
 package org.jabref.languageserver;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
-import org.jabref.logic.integrity.IntegrityCheck;
-import org.jabref.logic.journals.JournalAbbreviationRepository;
-import org.jabref.logic.preferences.CliPreferences;
-import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.languageserver.util.LspDiagnosticHandler;
 
 import org.eclipse.lsp4j.CompletionItem;
 import org.eclipse.lsp4j.CompletionList;
 import org.eclipse.lsp4j.CompletionParams;
-import org.eclipse.lsp4j.Diagnostic;
-import org.eclipse.lsp4j.DiagnosticSeverity;
 import org.eclipse.lsp4j.DidChangeTextDocumentParams;
 import org.eclipse.lsp4j.DidCloseTextDocumentParams;
 import org.eclipse.lsp4j.DidOpenTextDocumentParams;
 import org.eclipse.lsp4j.DidSaveTextDocumentParams;
-import org.eclipse.lsp4j.Position;
-import org.eclipse.lsp4j.PublishDiagnosticsParams;
-import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.messages.Either;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.TextDocumentService;
 
 public class BibtexTextDocumentService implements TextDocumentService {
 
-    private static final Range NULL_RANGE = new Range(new Position(0, 0), new Position(0, 0));
-    private final CliPreferences jabRefCliPreferences;
-    private final JournalAbbreviationRepository abbreviationRepository;
+    private final LspDiagnosticHandler diagnosticHandler;
+
     private LanguageClient client;
 
-    public BibtexTextDocumentService(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
-        this.jabRefCliPreferences = cliPreferences;
-        this.abbreviationRepository = abbreviationRepository;
+    public BibtexTextDocumentService(LspDiagnosticHandler diagnosticHandler) {
+        this.diagnosticHandler = Objects.requireNonNull(diagnosticHandler);
     }
 
     public void setClient(LanguageClient client) {
@@ -42,85 +33,22 @@ public void setClient(LanguageClient client) {
 
     @Override
     public void didOpen(DidOpenTextDocumentParams params) {
-        handleDiagnostics(params.getTextDocument().getUri(), params.getTextDocument().getText(), params.getTextDocument().getVersion());
+        diagnosticHandler.computeAndPublishDiagnostics(client, params.getTextDocument().getUri(), params.getTextDocument().getText(), params.getTextDocument().getVersion());
     }
 
     @Override
     public void didChange(DidChangeTextDocumentParams params) {
-        handleDiagnostics(params.getTextDocument().getUri(), params.getContentChanges().getFirst().getText(), params.getTextDocument().getVersion());
+        diagnosticHandler.computeAndPublishDiagnostics(client, params.getTextDocument().getUri(), params.getContentChanges().getFirst().getText(), params.getTextDocument().getVersion());
     }
 
     @Override
-    public void didClose(DidCloseTextDocumentParams params) {
-        client.publishDiagnostics(new PublishDiagnosticsParams(params.getTextDocument().getUri(), List.of()));
-    }
+    public void didClose(DidCloseTextDocumentParams params) { }
 
     @Override
-    public void didSave(DidSaveTextDocumentParams params) {
-    }
+    public void didSave(DidSaveTextDocumentParams params) { }
 
     @Override
     public CompletableFuture<Either<List<CompletionItem>, CompletionList>> completion(CompletionParams position) {
         return TextDocumentService.super.completion(position);
     }
-
-    private void handleDiagnostics(String uri, String content, int version) {
-        BibDatabaseContext bibDatabaseContext;
-        try {
-            bibDatabaseContext = BibDatabaseContext.of(content, jabRefCliPreferences.getImportFormatPreferences());
-        } catch (Exception e) {
-            Diagnostic parseDiagnostic = new Diagnostic(
-                    NULL_RANGE,
-                    "Parse error: " + e.getMessage(),
-                    DiagnosticSeverity.Error,
-                    "JabRef"
-            );
-            client.publishDiagnostics(new PublishDiagnosticsParams(uri, List.of(parseDiagnostic), version));
-            return;
-        }
-
-        IntegrityCheck integrityCheck = new IntegrityCheck(
-                bibDatabaseContext,
-                jabRefCliPreferences.getFilePreferences(),
-                jabRefCliPreferences.getCitationKeyPatternPreferences(),
-                abbreviationRepository,
-                true
-        );
-
-        List<Diagnostic> diagnostics = bibDatabaseContext.getEntries().stream()
-                                                         .flatMap(entry -> integrityCheck.checkEntry(entry).stream()
-                                                                                         .map(message -> new Diagnostic(
-                                                                                                 findTextRange(content, entry.getParsedSerialization()),
-                                                                                                 message.message(),
-                                                                                                 DiagnosticSeverity.Warning,
-                                                                                                 "JabRef"
-                                                                                         ))
-                                                         )
-                                                         .toList();
-
-        client.publishDiagnostics(new PublishDiagnosticsParams(uri, diagnostics, version));
-    }
-
-    private static Range findTextRange(String content, String searchText) {
-        int startOffset = content.indexOf(searchText);
-        if (startOffset == -1) {
-            return NULL_RANGE;
-        }
-        int endOffset = startOffset + searchText.length();
-        return new Range(offsetToPosition(content, startOffset), offsetToPosition(content, endOffset));
-    }
-
-    private static Position offsetToPosition(String content, int offset) {
-        int line = 0;
-        int col = 0;
-        for (int i = 0; i < offset; i++) {
-            if (content.charAt(i) == '\n') {
-                line++;
-                col = 0;
-            } else {
-                col++;
-            }
-        }
-        return new Position(line, col);
-    }
 }
diff --git a/jabls/src/main/java/org/jabref/languageserver/BibtexWorkspaceService.java b/jabls/src/main/java/org/jabref/languageserver/BibtexWorkspaceService.java
index 3c81c3534ae..d0a3a6d10a6 100644
--- a/jabls/src/main/java/org/jabref/languageserver/BibtexWorkspaceService.java
+++ b/jabls/src/main/java/org/jabref/languageserver/BibtexWorkspaceService.java
@@ -1,5 +1,8 @@
 package org.jabref.languageserver;
 
+import org.jabref.languageserver.util.LspDiagnosticHandler;
+
+import com.google.gson.JsonObject;
 import org.eclipse.lsp4j.DidChangeConfigurationParams;
 import org.eclipse.lsp4j.DidChangeWatchedFilesParams;
 import org.eclipse.lsp4j.services.LanguageClient;
@@ -11,11 +14,25 @@ public class BibtexWorkspaceService implements WorkspaceService {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(BibtexWorkspaceService.class);
 
+    private final LspClientHandler clientHandler;
+    private final LspDiagnosticHandler diagnosticHandler;
+
     private LanguageClient client;
 
+    public BibtexWorkspaceService(LspClientHandler clientHandler, LspDiagnosticHandler diagnosticHandler) {
+        this.clientHandler = clientHandler;
+        this.diagnosticHandler = diagnosticHandler;
+    }
+
     // Todo: handle event
     @Override
     public void didChangeConfiguration(DidChangeConfigurationParams didChangeConfigurationParams) {
+        if (didChangeConfigurationParams.getSettings() instanceof JsonObject settings) {
+            clientHandler.getSettings().copyFromJsonObject(settings);
+            LOGGER.info("Updated settings: {}", clientHandler.getSettings());
+            diagnosticHandler.refreshDiagnostics(client);
+            LOGGER.debug("Refreshed diagnostics.");
+        }
         LOGGER.debug("DidChangeConfigurationParams: {}", didChangeConfigurationParams);
     }
 
diff --git a/jabls/src/main/java/org/jabref/languageserver/ExtensionSettings.java b/jabls/src/main/java/org/jabref/languageserver/ExtensionSettings.java
new file mode 100644
index 00000000000..c1b41b2a94b
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/ExtensionSettings.java
@@ -0,0 +1,53 @@
+package org.jabref.languageserver;
+
+import com.google.gson.JsonObject;
+
+public class ExtensionSettings {
+    private boolean consistencyCheck;
+    private boolean integrityCheck;
+
+    private ExtensionSettings() {
+        this.consistencyCheck = true;
+        this.integrityCheck = true;
+    }
+
+    public static ExtensionSettings getDefaultSettings() {
+        return new ExtensionSettings();
+    }
+
+    public void setConsistencyCheck(boolean consistencyCheck) {
+        this.consistencyCheck = consistencyCheck;
+    }
+
+    public boolean isConsistencyCheck() {
+        return consistencyCheck;
+    }
+
+    public void setIntegrityCheck(boolean integrityCheck) {
+        this.integrityCheck = integrityCheck;
+    }
+
+    public boolean isIntegrityCheck() {
+        return integrityCheck;
+    }
+
+    public void copyFromJsonObject(JsonObject json) {
+        if (json.has("jabref") && json.get("jabref").isJsonObject()) {
+            json = json.getAsJsonObject("jabref");
+        }
+        if (json.has("consistencyCheck") && json.get("consistencyCheck").isJsonPrimitive()) {
+            this.consistencyCheck = json.get("consistencyCheck").getAsBoolean();
+        }
+        if (json.has("integrityCheck") && json.get("integrityCheck").isJsonPrimitive()) {
+            this.integrityCheck = json.get("integrityCheck").getAsBoolean();
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ExtensionSettings{" +
+                "consistencyCheck=" + consistencyCheck +
+                ", integrityCheck=" + integrityCheck +
+                '}';
+    }
+}
diff --git a/jabls/src/main/java/org/jabref/languageserver/LSPServer.java b/jabls/src/main/java/org/jabref/languageserver/LspClientHandler.java
similarity index 72%
rename from jabls/src/main/java/org/jabref/languageserver/LSPServer.java
rename to jabls/src/main/java/org/jabref/languageserver/LspClientHandler.java
index 91caba54b3e..01b719b3132 100644
--- a/jabls/src/main/java/org/jabref/languageserver/LSPServer.java
+++ b/jabls/src/main/java/org/jabref/languageserver/LspClientHandler.java
@@ -2,6 +2,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import org.jabref.languageserver.util.LspDiagnosticHandler;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.preferences.CliPreferences;
 
@@ -12,6 +13,7 @@
 import org.eclipse.lsp4j.ServerCapabilities;
 import org.eclipse.lsp4j.TextDocumentSyncKind;
 import org.eclipse.lsp4j.TextDocumentSyncOptions;
+import org.eclipse.lsp4j.WorkspaceServerCapabilities;
 import org.eclipse.lsp4j.services.LanguageClient;
 import org.eclipse.lsp4j.services.LanguageClientAware;
 import org.eclipse.lsp4j.services.LanguageServer;
@@ -20,17 +22,22 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LSPServer implements LanguageServer, LanguageClientAware {
+public class LspClientHandler implements LanguageServer, LanguageClientAware {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LSPServer.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LspClientHandler.class);
+
+    private final LspDiagnosticHandler diagnosticHandler;
+    private final BibtexWorkspaceService workspaceService;
+    private final BibtexTextDocumentService textDocumentService;
+    private final ExtensionSettings settings;
 
     private LanguageClient client;
-    private BibtexWorkspaceService workspaceService;
-    private BibtexTextDocumentService textDocumentService;
 
-    public LSPServer(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
-        this.workspaceService = new BibtexWorkspaceService();
-        this.textDocumentService = new BibtexTextDocumentService(cliPreferences, abbreviationRepository);
+    public LspClientHandler(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
+        this.settings = ExtensionSettings.getDefaultSettings();
+        this.diagnosticHandler = new LspDiagnosticHandler(this, cliPreferences, abbreviationRepository);
+        this.workspaceService = new BibtexWorkspaceService(this, diagnosticHandler);
+        this.textDocumentService = new BibtexTextDocumentService(diagnosticHandler);
     }
 
     @Override
@@ -43,6 +50,7 @@ public CompletableFuture<InitializeResult> initialize(InitializeParams params) {
         syncOptions.setOpenClose(true);
 
         capabilities.setTextDocumentSync(syncOptions);
+        capabilities.setWorkspace(new WorkspaceServerCapabilities());
 
         return CompletableFuture.completedFuture(new InitializeResult(capabilities));
     }
@@ -69,6 +77,10 @@ public WorkspaceService getWorkspaceService() {
         return this.workspaceService;
     }
 
+    public ExtensionSettings getSettings() {
+        return settings;
+    }
+
     @Override
     public void connect(LanguageClient client) {
         this.client = client;
diff --git a/jabls/src/main/java/org/jabref/languageserver/LSPLauncher.java b/jabls/src/main/java/org/jabref/languageserver/LspLauncher.java
similarity index 65%
rename from jabls/src/main/java/org/jabref/languageserver/LSPLauncher.java
rename to jabls/src/main/java/org/jabref/languageserver/LspLauncher.java
index 1fa997a443b..207f3e83087 100644
--- a/jabls/src/main/java/org/jabref/languageserver/LSPLauncher.java
+++ b/jabls/src/main/java/org/jabref/languageserver/LspLauncher.java
@@ -9,6 +9,7 @@
 import java.util.concurrent.Executors;
 import java.util.function.Function;
 
+import org.jabref.logic.journals.JournalAbbreviationLoader;
 import org.jabref.logic.journals.JournalAbbreviationRepository;
 import org.jabref.logic.preferences.CliPreferences;
 
@@ -17,32 +18,35 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class LSPLauncher {
+public class LspLauncher extends Thread {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(LSPLauncher.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(LspLauncher.class);
 
-    private ServerSocket serverSocket;
-    private ExecutorService threadPool;
-    private volatile boolean running;
-    private CliPreferences cliPreferences;
-    private JournalAbbreviationRepository abbreviationRepository;
+    private final CliPreferences cliPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
+    private final ExecutorService threadPool;
 
-    public void run(CliPreferences cliPreferences) {
-        run(cliPreferences, new JournalAbbreviationRepository());
-    }
+    private final int port;
+    private volatile boolean running;
+    private ServerSocket serverSocket;
 
-    public void run(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
+    public LspLauncher(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository, int port) {
         this.cliPreferences = cliPreferences;
         this.abbreviationRepository = abbreviationRepository;
-        start(2087);
+        this.threadPool = Executors.newCachedThreadPool();
+        this.port = port;
+        this.setName("JabLs - JabRef Language Server on: " + port);
+    }
+
+    public LspLauncher(CliPreferences cliPreferences, int port) {
+        this(cliPreferences, JournalAbbreviationLoader.loadRepository(cliPreferences.getJournalAbbreviationPreferences()), port);
     }
 
-    public void start(int port) {
+    @Override
+    public void run() {
+        running = true;
         try {
             serverSocket = new ServerSocket(port);
-            threadPool = Executors.newCachedThreadPool();
-            running = true;
-
             threadPool.execute(() -> {
                 LOGGER.info("LSP Server listening on port {}...", port);
                 while (running) {
@@ -65,15 +69,15 @@ public void start(int port) {
     }
 
     private void handleClient(Socket socket) {
-        LSPServer server = new LSPServer(cliPreferences, abbreviationRepository);
-        LOGGER.debug("LSP server started.");
+        LspClientHandler clientHandler = new LspClientHandler(cliPreferences, abbreviationRepository);
+        LOGGER.debug("LSP clientHandler started.");
         try (socket; // socket should be closed on error
              InputStream in = socket.getInputStream();
              OutputStream out = socket.getOutputStream()) {
-            Launcher<LanguageClient> launcher = org.eclipse.lsp4j.launch.LSPLauncher.createServerLauncher(server, in, out, Executors.newCachedThreadPool(), Function.identity());
-            LOGGER.debug("LSP server launched.");
-            server.connect(launcher.getRemoteProxy());
-            LOGGER.debug("LSP server connected.");
+            Launcher<LanguageClient> launcher = org.eclipse.lsp4j.launch.LSPLauncher.createServerLauncher(clientHandler, in, out, Executors.newCachedThreadPool(), Function.identity());
+            LOGGER.debug("LSP clientHandler launched.");
+            clientHandler.connect(launcher.getRemoteProxy());
+            LOGGER.debug("LSP clientHandler connected.");
             launcher.startListening().get();
         } catch (Throwable e) {
             LOGGER.error("Error in handleClient", e);
@@ -82,8 +86,8 @@ private void handleClient(Socket socket) {
         }
     }
 
-    public void shutdown() {
-        running = false;
+    @Override
+    public void interrupt() {
         try {
             if (serverSocket != null && !serverSocket.isClosed()) {
                 serverSocket.close();
@@ -94,6 +98,11 @@ public void shutdown() {
         } catch (IOException e) {
             LOGGER.error("Error during LSP shutdown", e);
         }
+        running = false;
         LOGGER.info("LSP Server shutdown.");
     }
+
+    public boolean isRunning() {
+        return running;
+    }
 }
diff --git a/jabls/src/main/java/org/jabref/languageserver/controller/LanguageServerController.java b/jabls/src/main/java/org/jabref/languageserver/controller/LanguageServerController.java
new file mode 100644
index 00000000000..84a4992bded
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/controller/LanguageServerController.java
@@ -0,0 +1,57 @@
+package org.jabref.languageserver.controller;
+
+import org.jabref.languageserver.LspLauncher;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.preferences.CliPreferences;
+
+import org.jspecify.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/// Manages the LspLauncher through typical life cycle methods.
+public class LanguageServerController implements AutoCloseable {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LanguageServerController.class);
+
+    private final CliPreferences cliPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
+
+    @Nullable private LspLauncher lspLauncher;
+
+    public LanguageServerController(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
+        this.cliPreferences = cliPreferences;
+        this.abbreviationRepository = abbreviationRepository;
+        LOGGER.debug("LanguageServerController initialized.");
+    }
+
+    public synchronized void start(int port) {
+        if (lspLauncher != null) {
+            LOGGER.warn("Language server controller already started, cannot start again.");
+            return;
+        }
+
+        lspLauncher = new LspLauncher(cliPreferences, abbreviationRepository, port);
+        // This enqueues the thread to run in the background
+        // The JVM will take care of running it at some point in time in the future
+        // Thus, we cannot check directly if it really runs
+        lspLauncher.start();
+        LOGGER.debug("Triggered language server start up.");
+    }
+
+    public synchronized void stop() {
+        LOGGER.debug("Stopping language server controller...");
+        if (lspLauncher != null) {
+            lspLauncher.interrupt();
+            lspLauncher = null;
+            LOGGER.debug("Language server stopped successfully.");
+        } else {
+            LOGGER.debug("Language server is not started, nothing to stop.");
+        }
+    }
+
+    @Override
+    public void close() {
+        LOGGER.debug("Closing Language server controller...");
+        stop();
+    }
+}
diff --git a/jabls/src/main/java/org/jabref/languageserver/controller/package-info.java b/jabls/src/main/java/org/jabref/languageserver/controller/package-info.java
new file mode 100644
index 00000000000..2f1a1cdf1b5
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/controller/package-info.java
@@ -0,0 +1,2 @@
+/// Implemented similar to package org.jabref.logic.remote.server;
+package org.jabref.languageserver.controller;
diff --git a/jabls/src/main/java/org/jabref/languageserver/util/LspConsistencyCheck.java b/jabls/src/main/java/org/jabref/languageserver/util/LspConsistencyCheck.java
new file mode 100644
index 00000000000..75358fbb601
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/util/LspConsistencyCheck.java
@@ -0,0 +1,75 @@
+package org.jabref.languageserver.util;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.quality.consistency.BibliographyConsistencyCheck;
+import org.jabref.model.database.BibDatabaseContext;
+import org.jabref.model.entry.BibEntryType;
+import org.jabref.model.entry.BibEntryTypesManager;
+import org.jabref.model.entry.field.BibField;
+import org.jabref.model.entry.field.Field;
+
+import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+
+public class LspConsistencyCheck {
+
+    public List<Diagnostic> check(BibDatabaseContext bibDatabaseContext, String content) {
+        List<Diagnostic> diagnostics = new ArrayList<>();
+        BibliographyConsistencyCheck consistencyCheck = new BibliographyConsistencyCheck();
+        BibliographyConsistencyCheck.Result result = consistencyCheck.check(bibDatabaseContext.getEntries(), (_, _) -> {
+        });
+
+        List<Field> allReportedFields = result.entryTypeToResultMap().values().stream()
+                                              .flatMap(entryTypeResult -> entryTypeResult.fields().stream())
+                                              .sorted(Comparator.comparing(Field::getName))
+                                              .distinct()
+                                              .toList();
+
+        result.entryTypeToResultMap().forEach((entryType, entryTypeResult) -> {
+            Optional<BibEntryType> bibEntryType = new BibEntryTypesManager().enrich(entryType, bibDatabaseContext.getMode());
+            Set<Field> requiredFields = bibEntryType
+                    .map(BibEntryType::getRequiredFields)
+                    .stream()
+                    .flatMap(Collection::stream)
+                    .flatMap(orFields -> orFields.getFields().stream())
+                    .collect(Collectors.toSet());
+
+            entryTypeResult.sortedEntries().forEach(entry -> requiredFields.forEach(requiredField -> {
+                if (entry.getFieldOrAlias(requiredField).isEmpty()) {
+                    LspDiagnosticBuilder diagnosticBuilder = LspDiagnosticBuilder.create(Localization.lang("Required field \"%0\" is empty.", requiredField.getName()));
+                    diagnosticBuilder.setSeverity(DiagnosticSeverity.Error);
+                    diagnosticBuilder.setContent(content);
+                    diagnosticBuilder.setEntry(entry);
+                    diagnostics.add(diagnosticBuilder.build());
+                }
+            }));
+
+            Set<Field> optionalFields = bibEntryType
+                    .map(BibEntryType::getOptionalFields)
+                    .stream()
+                    .flatMap(Collection::stream)
+                    .map(BibField::field)
+                    .filter(allReportedFields::contains)
+                    .collect(Collectors.toSet());
+
+            optionalFields.forEach(optionalField -> entryTypeResult.sortedEntries().forEach(entry -> {
+                if (entry.getFieldOrAlias(optionalField).isEmpty()) {
+                    LspDiagnosticBuilder diagnosticBuilder = LspDiagnosticBuilder.create(Localization.lang("Optional field \"%0\" is empty.", optionalField.getName()));
+                    diagnosticBuilder.setContent(content);
+                    diagnosticBuilder.setEntry(entry);
+                    diagnostics.add(diagnosticBuilder.build());
+                }
+            }));
+        });
+
+        return diagnostics;
+    }
+}
diff --git a/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticBuilder.java b/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticBuilder.java
new file mode 100644
index 00000000000..8ebc0b7f47f
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticBuilder.java
@@ -0,0 +1,122 @@
+package org.jabref.languageserver.util;
+
+import java.util.Objects;
+import java.util.Optional;
+
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.field.Field;
+
+import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+import org.eclipse.lsp4j.Position;
+import org.eclipse.lsp4j.Range;
+
+public final class LspDiagnosticBuilder {
+
+    private static final Range NULL_RANGE = new Range(new Position(0, 0), new Position(0, 0));
+    private static final String DEFAULT_SOURCE = "JabRef";
+
+    private String message;
+    private DiagnosticSeverity severity = DiagnosticSeverity.Warning;
+    private String source = DEFAULT_SOURCE;
+
+    private String content;
+    private BibEntry entry;
+    private Field field;
+    private Range explicitRange;
+
+    private LspDiagnosticBuilder() { }
+
+    public static LspDiagnosticBuilder create(String message) {
+        return new LspDiagnosticBuilder().setMessage(message);
+    }
+
+    public LspDiagnosticBuilder setMessage(String message) {
+        this.message = Objects.requireNonNull(message, "message must not be null");
+        return this;
+    }
+
+    public LspDiagnosticBuilder setSeverity(DiagnosticSeverity severity) {
+        this.severity = Objects.requireNonNull(severity, "severity must not be null");
+        return this;
+    }
+
+    public LspDiagnosticBuilder setSource(String source) {
+        this.source = Objects.requireNonNull(source, "source must not be null");
+        return this;
+    }
+
+    public LspDiagnosticBuilder setContent(String content) {
+        this.content = content;
+        return this;
+    }
+
+    public LspDiagnosticBuilder setEntry(BibEntry entry) {
+        this.entry = entry;
+        return this;
+    }
+
+    public LspDiagnosticBuilder setField(Field field) {
+        this.field = field;
+        return this;
+    }
+
+    public LspDiagnosticBuilder setRange(Range range) {
+        this.explicitRange = range;
+        return this;
+    }
+
+    public Diagnostic build() {
+        Objects.requireNonNull(message, "message must be set");
+
+        Range range = computeRange();
+        return new Diagnostic(range, message, severity, source);
+    }
+
+    private Range computeRange() {
+        if (explicitRange != null) {
+            return explicitRange;
+        }
+
+        if (content == null || entry == null) {
+            return NULL_RANGE;
+        }
+
+        if (field != null) {
+            Optional<String> entryField = entry.getFieldOrAlias(field);
+            if (entryField.isPresent()) {
+                return findTextRange(content, entryField.get());
+            }
+            return entry.getCitationKey()
+                        .map(key -> findTextRange(content, key))
+                        .orElse(NULL_RANGE);
+        }
+
+        return entry.getCitationKey()
+                    .map(key -> findTextRange(content, key))
+                    .orElse(NULL_RANGE);
+    }
+
+    private static Range findTextRange(String content, String searchText) {
+        int startOffset = content.indexOf(searchText);
+        if (startOffset == -1) {
+            return NULL_RANGE;
+        }
+        int endOffset = startOffset + searchText.length();
+        return new Range(offsetToPosition(content, startOffset), offsetToPosition(content, endOffset));
+    }
+
+    private static Position offsetToPosition(String content, int offset) {
+        int line = 0;
+        int col = 0;
+        for (int i = 0; i < offset; i++) {
+            if (content.charAt(i) == '\n') {
+                line++;
+                col = 0;
+            } else {
+                col++;
+            }
+        }
+        return new Position(line, col);
+    }
+}
diff --git a/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticHandler.java b/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticHandler.java
new file mode 100644
index 00000000000..77397cb90a1
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/util/LspDiagnosticHandler.java
@@ -0,0 +1,105 @@
+package org.jabref.languageserver.util;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Stream;
+
+import org.jabref.languageserver.ExtensionSettings;
+import org.jabref.languageserver.LspClientHandler;
+import org.jabref.logic.JabRefException;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.l10n.Localization;
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.eclipse.lsp4j.Diagnostic;
+import org.eclipse.lsp4j.DiagnosticSeverity;
+import org.eclipse.lsp4j.PublishDiagnosticsParams;
+import org.eclipse.lsp4j.services.LanguageClient;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LspDiagnosticHandler {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(LspDiagnosticHandler.class);
+    private static final int NO_VERSION = -1;
+
+    private final CliPreferences jabRefCliPreferences;
+    private final LspIntegrityCheck lspIntegrityCheck;
+    private final LspConsistencyCheck lspConsistencyCheck;
+    private final LspClientHandler clientHandler;
+    private final Map<String, List<Diagnostic>> integrityDiagnosticsCache; // Maps file URIs to the corresponding list of integrity diagnostics
+    private final Map<String, List<Diagnostic>> consistencyDiagnosticsCache; // Maps file URIs to the corresponding list of consistency diagnostics
+
+    private LanguageClient client;
+
+    public LspDiagnosticHandler(LspClientHandler clientHandler, CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
+        this.clientHandler = clientHandler;
+        this.jabRefCliPreferences = cliPreferences;
+        this.lspIntegrityCheck = new LspIntegrityCheck(cliPreferences, abbreviationRepository);
+        this.lspConsistencyCheck = new LspConsistencyCheck();
+        this.integrityDiagnosticsCache = new ConcurrentHashMap<>();
+        this.consistencyDiagnosticsCache = new ConcurrentHashMap<>();
+    }
+
+    public void computeAndPublishDiagnostics(LanguageClient client, String uri, String content, Integer version) {
+        List<Diagnostic> diagnostics = computeDiagnostics(content, uri);
+        publishDiagnostics(client, uri, version, diagnostics);
+    }
+
+    public void publishDiagnostics(LanguageClient client, String uri, Integer version, List<Diagnostic> diagnostics) {
+        PublishDiagnosticsParams params = new PublishDiagnosticsParams();
+        params.setUri(uri);
+        params.setVersion(version);
+        params.setDiagnostics(diagnostics);
+        client.publishDiagnostics(params);
+    }
+
+    public void publishDiagnostics(LanguageClient client, String uri, List<Diagnostic> diagnostics) {
+        publishDiagnostics(client, uri, NO_VERSION, diagnostics);
+    }
+
+    private List<Diagnostic> computeDiagnostics(String content, String uri) {
+        BibDatabaseContext bibDatabaseContext;
+        try {
+            bibDatabaseContext = BibDatabaseContext.of(content, jabRefCliPreferences.getImportFormatPreferences());
+        } catch (JabRefException e) {
+            Diagnostic parseDiagnostic = LspDiagnosticBuilder.create(Localization.lang(
+                    "Failed to parse entries.\nThe following error was encountered:\n%0",
+                    e.getMessage())).setSeverity(DiagnosticSeverity.Error).build();
+            return List.of(parseDiagnostic);
+        }
+
+        if (clientHandler.getSettings().isIntegrityCheck()) {
+            integrityDiagnosticsCache.put(uri, lspIntegrityCheck.check(bibDatabaseContext, content));
+            LOGGER.debug("Cached integrity diagnostics for {}", uri);
+        }
+
+        if (clientHandler.getSettings().isConsistencyCheck()) {
+            consistencyDiagnosticsCache.put(uri, lspConsistencyCheck.check(bibDatabaseContext, content));
+            LOGGER.debug("Cached consistency diagnostics for {}", uri);
+        }
+
+        return getFinalDiagnosticsList(uri);
+    }
+
+    private List<Diagnostic> getFinalDiagnosticsList(String uri) {
+        ExtensionSettings settings = clientHandler.getSettings();
+        return Stream.concat(
+                settings.isIntegrityCheck() ? integrityDiagnosticsCache.getOrDefault(uri, List.of()).stream() : Stream.empty(),
+                settings.isConsistencyCheck() ? consistencyDiagnosticsCache.getOrDefault(uri, List.of()).stream() : Stream.empty()
+        ).toList();
+    }
+
+    public void refreshDiagnostics(LanguageClient client) {
+        Set<String> allUris = new HashSet<>(integrityDiagnosticsCache.keySet());
+        allUris.addAll(consistencyDiagnosticsCache.keySet());
+        allUris.forEach(uri -> {
+            List<Diagnostic> diagnostics = getFinalDiagnosticsList(uri);
+            publishDiagnostics(client, uri, diagnostics);
+        });
+    }
+}
diff --git a/jabls/src/main/java/org/jabref/languageserver/util/LspIntegrityCheck.java b/jabls/src/main/java/org/jabref/languageserver/util/LspIntegrityCheck.java
new file mode 100644
index 00000000000..a5600feb079
--- /dev/null
+++ b/jabls/src/main/java/org/jabref/languageserver/util/LspIntegrityCheck.java
@@ -0,0 +1,41 @@
+package org.jabref.languageserver.util;
+
+import java.util.List;
+
+import org.jabref.logic.integrity.IntegrityCheck;
+import org.jabref.logic.journals.JournalAbbreviationRepository;
+import org.jabref.logic.preferences.CliPreferences;
+import org.jabref.model.database.BibDatabaseContext;
+
+import org.eclipse.lsp4j.Diagnostic;
+
+public class LspIntegrityCheck {
+
+    private static final boolean ALLOW_INTEGER_EDITION = true;
+
+    private final CliPreferences cliPreferences;
+    private final JournalAbbreviationRepository abbreviationRepository;
+
+    public LspIntegrityCheck(CliPreferences cliPreferences, JournalAbbreviationRepository abbreviationRepository) {
+        this.cliPreferences = cliPreferences;
+        this.abbreviationRepository = abbreviationRepository;
+    }
+
+    public List<Diagnostic> check(BibDatabaseContext bibDatabaseContext, String content) {
+        IntegrityCheck integrityCheck = new IntegrityCheck(
+                bibDatabaseContext,
+                cliPreferences.getFilePreferences(),
+                cliPreferences.getCitationKeyPatternPreferences(),
+                abbreviationRepository,
+                ALLOW_INTEGER_EDITION
+        );
+
+        return bibDatabaseContext.getEntries().stream().flatMap(entry -> integrityCheck.checkEntry(entry).stream().map(message -> {
+            if (entry.getField(message.field()).isPresent()) {
+                return LspDiagnosticBuilder.create(message.message()).setField(message.field()).setContent(content).setEntry(entry).build();
+            } else {
+                return LspDiagnosticBuilder.create(message.message()).setContent(content).setEntry(entry).build();
+            }
+        })).toList();
+    }
+}
diff --git a/jabsrv/src/main/java/module-info.java b/jabsrv/src/main/java/module-info.java
index 4031ddff5e7..5f9b180b771 100644
--- a/jabsrv/src/main/java/module-info.java
+++ b/jabsrv/src/main/java/module-info.java
@@ -59,8 +59,4 @@
     requires com.fasterxml.jackson.annotation;
     requires com.fasterxml.jackson.databind;
 
-    requires lsp4j;
-    requires lsp4j.jsonrpc;
-    requires lsp4j.websocket;
-    requires lsp4j.websocket.jakarta;
 }