diff --git a/pom.xml b/pom.xml
index af05cb5..5387e4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -540,7 +540,7 @@
 			<properties>
 				<maven.compiler.source>21</maven.compiler.source>
 				<maven.compiler.target>21</maven.compiler.target>
-				<vaadin.version>25.0.0-beta2</vaadin.version>
+				<vaadin.version>25.0.0</vaadin.version>
 				<jetty.version>11.0.26</jetty.version>
 			</properties>
 			<dependencies>
@@ -550,6 +550,11 @@
 					<version>5.0.0</version>
 					<scope>test</scope>
 				</dependency>
+				<dependency>
+					<groupId>com.vaadin</groupId>
+					<artifactId>vaadin-dev</artifactId>
+					<optional>true</optional>
+				</dependency>
 			</dependencies>
 		</profile>
 		
diff --git a/src/main/java/com/flowingcode/vaadin/addons/googlemaps/GoogleMap.java b/src/main/java/com/flowingcode/vaadin/addons/googlemaps/GoogleMap.java
index a1d01ac..77e3687 100644
--- a/src/main/java/com/flowingcode/vaadin/addons/googlemaps/GoogleMap.java
+++ b/src/main/java/com/flowingcode/vaadin/addons/googlemaps/GoogleMap.java
@@ -47,7 +47,6 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import lombok.experimental.ExtensionMethod;
-import org.apache.commons.lang3.StringUtils;
 
 @SuppressWarnings("serial")
 @Tag("google-map")
@@ -83,14 +82,18 @@ public enum MapType {
    */
   public GoogleMap(String apiKey, String clientId, String language) {
     getElement().setAttribute("api-key", apiKey);
-    if (!StringUtils.isEmpty(clientId)) {
+    if (!isEmpty(clientId)) {
       getElement().setAttribute("client-id", clientId);
     }
-    if (!StringUtils.isEmpty(language)) {
+    if (!isEmpty(language)) {
       getElement().setAttribute("language", language);
     }
   }
 
+  private static boolean isEmpty(final String s) {
+    return s == null || s.length() == 0;
+  }
+
   @Synchronize("google-map-idle")
   public Double getLatitude() {
     return getElement().getProperty("latitude", 0d);