diff --git a/flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java b/flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java
index 93ec442c83..273efefd87 100644
--- a/flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java
+++ b/flutter-idea/src/io/flutter/deeplinks/DeepLinksViewFactory.java
@@ -56,8 +56,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         }
 
         final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
-          .setDevToolsHost(instance.host)
-          .setDevToolsPort(instance.port)
+          .setDevToolsHost(instance.host())
+          .setDevToolsPort(instance.port())
           .setPage("deep-links")
           .setEmbed(true)
           .setFlutterSdkVersion(sdkVersion)
diff --git a/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java b/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
index 836e16d5f3..af17d6c4fe 100644
--- a/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
+++ b/flutter-idea/src/io/flutter/devtools/DevToolsExtensionsViewFactory.java
@@ -65,8 +65,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         }
 
         final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
-          .setDevToolsHost(instance.host)
-          .setDevToolsPort(instance.port)
+          .setDevToolsHost(instance.host())
+          .setDevToolsPort(instance.port())
           .setHide("all-except-extensions")
           .setEmbed(true).setFlutterSdkVersion(sdkVersion)
           .setWorkspaceCache(WorkspaceCache.getInstance(project))
diff --git a/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java b/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
index a89e6ebf27..e1569da740 100644
--- a/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
+++ b/flutter-idea/src/io/flutter/devtools/RemainingDevToolsViewFactory.java
@@ -65,8 +65,8 @@ public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindo
         }
 
         final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
-          .setDevToolsHost(instance.host)
-          .setDevToolsPort(instance.port)
+          .setDevToolsHost(instance.host())
+          .setDevToolsPort(instance.port())
           .setHide("home,inspector,deep-links,extensions")
           .setEmbed(true).setFlutterSdkVersion(sdkVersion)
           .setWorkspaceCache(WorkspaceCache.getInstance(project))
diff --git a/flutter-idea/src/io/flutter/run/OpenDevToolsAction.java b/flutter-idea/src/io/flutter/run/OpenDevToolsAction.java
index d0e45a00cb..2aa8666ee1 100644
--- a/flutter-idea/src/io/flutter/run/OpenDevToolsAction.java
+++ b/flutter-idea/src/io/flutter/run/OpenDevToolsAction.java
@@ -24,6 +24,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 public class OpenDevToolsAction extends DumbAwareAction {
   private static final Logger LOG = Logger.getInstance(OpenDevToolsAction.class);
   private static final String title = "Open Flutter DevTools in Browser";
@@ -68,7 +70,7 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
       return;
     }
 
-    AsyncUtils.whenCompleteUiThread(DevToolsService.getInstance(project).getDevToolsInstance(), (instance, ex) -> {
+    AsyncUtils.whenCompleteUiThread(Objects.requireNonNull(DevToolsService.getInstance(project).getDevToolsInstance()), (instance, ex) -> {
       if (project.isDisposed()) {
         return;
       }
@@ -81,18 +83,16 @@ public void actionPerformed(@NotNull final AnActionEvent event) {
       final String serviceUrl = myConnector != null && myConnector.getBrowserUrl() != null ? myConnector.getBrowserUrl() : null;
 
       FlutterSdk flutterSdk = FlutterSdk.getFlutterSdk(project);
-      BrowserLauncher.getInstance().browse(
-        new DevToolsUrl.Builder()
-          .setDevToolsHost(instance.host)
-          .setDevToolsPort(instance.port)
-          .setVmServiceUri(serviceUrl)
-          .setFlutterSdkVersion(flutterSdk == null ? null : flutterSdk.getVersion())
-          .setWorkspaceCache(WorkspaceCache.getInstance(project))
-          .setIdeFeature(DevToolsIdeFeature.RUN_CONSOLE)
-          .build()
-          .getUrlString(),
-        null
-      );
+      assert instance != null;
+      final String devToolsUrl = new DevToolsUrl.Builder().setDevToolsHost(instance.host())
+        .setDevToolsPort(instance.port())
+        .setVmServiceUri(serviceUrl)
+        .setFlutterSdkVersion(flutterSdk == null ? null : flutterSdk.getVersion())
+        .setWorkspaceCache(WorkspaceCache.getInstance(project))
+        .setIdeFeature(DevToolsIdeFeature.RUN_CONSOLE)
+        .build()
+        .getUrlString();
+      BrowserLauncher.getInstance().browse(devToolsUrl,null);
     });
   }
 }
diff --git a/flutter-idea/src/io/flutter/run/SdkFields.java b/flutter-idea/src/io/flutter/run/SdkFields.java
index 1152858a93..2f2046077f 100644
--- a/flutter-idea/src/io/flutter/run/SdkFields.java
+++ b/flutter-idea/src/io/flutter/run/SdkFields.java
@@ -227,7 +227,7 @@ public GeneralCommandLine createFlutterSdkRunCommand(
         }
       }, "Starting DevTools", false, project);
       final DevToolsInstance instance = devToolsFuture.get();
-      args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host + ":" + instance.port);
+      args = ArrayUtil.append(args, "--devtools-server-address=http://" + instance.host() + ":" + instance.port());
     }
     catch (Exception e) {
       LOG.info(e);
diff --git a/flutter-idea/src/io/flutter/run/bazel/BazelFields.java b/flutter-idea/src/io/flutter/run/bazel/BazelFields.java
index a54e0494e3..b3daf06ec7 100644
--- a/flutter-idea/src/io/flutter/run/bazel/BazelFields.java
+++ b/flutter-idea/src/io/flutter/run/bazel/BazelFields.java
@@ -333,7 +333,7 @@ else if (FlutterSettings.getInstance().isEnableBazelHotRestart() && !hasEnabledA
         }
       }, "Starting DevTools", false, project);
       final DevToolsInstance instance = devToolsFuture.get();
-      commandLine.addParameter("--devtools-server-address=http://" + instance.host + ":" + instance.port);
+      commandLine.addParameter("--devtools-server-address=http://" + instance.host() + ":" + instance.port());
     }
     catch (Exception e) {
       LOG.info(e);
diff --git a/flutter-idea/src/io/flutter/run/daemon/DevToolsInstance.java b/flutter-idea/src/io/flutter/run/daemon/DevToolsInstance.java
index 64d52f9bb4..17d3f495da 100644
--- a/flutter-idea/src/io/flutter/run/daemon/DevToolsInstance.java
+++ b/flutter-idea/src/io/flutter/run/daemon/DevToolsInstance.java
@@ -5,12 +5,5 @@
  */
 package io.flutter.run.daemon;
 
-public class DevToolsInstance {
-  final public String host;
-  final public int port;
-
-  public DevToolsInstance(String host, int port) {
-    this.host = host;
-    this.port = port;
-  }
+public record DevToolsInstance(String host, int port) {
 }
diff --git a/flutter-idea/src/io/flutter/view/FlutterView.java b/flutter-idea/src/io/flutter/view/FlutterView.java
index fcea698bf7..1cf887d1c6 100644
--- a/flutter-idea/src/io/flutter/view/FlutterView.java
+++ b/flutter-idea/src/io/flutter/view/FlutterView.java
@@ -165,8 +165,8 @@ private void addBrowserInspectorViewContent(FlutterApp app,
 
     if (isEmbedded) {
       final DevToolsUrl devToolsUrl = new DevToolsUrl.Builder()
-        .setDevToolsHost(devToolsInstance.host)
-        .setDevToolsPort(devToolsInstance.port)
+        .setDevToolsHost(devToolsInstance.host())
+        .setDevToolsPort(devToolsInstance.port())
         .setVmServiceUri(browserUrl)
         .setPage("inspector")
         .setEmbed(true)
@@ -200,8 +200,8 @@ private void addBrowserInspectorViewContent(FlutterApp app,
     else {
       BrowserLauncher.getInstance().browse(
         new DevToolsUrl.Builder()
-          .setDevToolsHost(devToolsInstance.host)
-          .setDevToolsPort(devToolsInstance.port)
+          .setDevToolsHost(devToolsInstance.host())
+          .setDevToolsPort(devToolsInstance.port())
           .setVmServiceUri(browserUrl)
           .setPage("inspector")
           .setFlutterSdkVersion(flutterSdkVersion)