diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
index abf91811b..7da989b82 100644
--- a/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
+++ b/ebean-core/src/main/java/io/ebeaninternal/server/type/ScalarTypeUUIDBase.java
@@ -35,6 +35,11 @@ abstract class ScalarTypeUUIDBase extends ScalarTypeBase<UUID> implements Scalar
     return true;
   }
 
+  @Override
+  public String format(Object value) {
+    return String.valueOf(value);
+  }
+
   @Override
   public String formatValue(UUID value) {
     return value.toString();
diff --git a/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java
new file mode 100644
index 000000000..397588994
--- /dev/null
+++ b/ebean-core/src/test/java/io/ebeaninternal/server/type/ScalarTypeUUIDBaseTest.java
@@ -0,0 +1,23 @@
+package io.ebeaninternal.server.type;
+
+import org.junit.Test;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ScalarTypeUUIDBaseTest {
+
+  private final ScalarTypeUUIDBase type = new ScalarTypeUUIDNative();
+  private final UUID uuid = UUID.randomUUID();
+
+  @Test
+  public void format_as_uuid() {
+    assertThat(type.format(uuid)).isEqualTo(uuid.toString());
+  }
+
+  @Test
+  public void format_as_String() {
+    assertThat(type.format(uuid.toString())).isEqualTo(uuid.toString());
+  }
+}