diff --git a/packages/database/src/api/Database.ts b/packages/database/src/api/Database.ts
index 7ba48480ac6..539196cec11 100644
--- a/packages/database/src/api/Database.ts
+++ b/packages/database/src/api/Database.ts
@@ -27,6 +27,7 @@ import {
   goOffline
 } from '../exp/Database';
 import { ref, refFromURL } from '../exp/Reference_impl';
+import { increment, serverTimestamp } from '../exp/ServerValue';
 
 import { Reference } from './Reference';
 
@@ -35,16 +36,8 @@ import { Reference } from './Reference';
  */
 export class Database implements FirebaseService, Compat<ExpDatabase> {
   static readonly ServerValue = {
-    TIMESTAMP: {
-      '.sv': 'timestamp'
-    },
-    increment: (delta: number) => {
-      return {
-        '.sv': {
-          'increment': delta
-        }
-      };
-    }
+    TIMESTAMP: serverTimestamp(),
+    increment: (delta: number) => increment(delta)
   };
 
   /**
diff --git a/packages/database/src/exp/ServerValue.ts b/packages/database/src/exp/ServerValue.ts
index fff9f29b52f..6fdecee1b2a 100644
--- a/packages/database/src/exp/ServerValue.ts
+++ b/packages/database/src/exp/ServerValue.ts
@@ -15,12 +15,18 @@
  * limitations under the License.
  */
 
+const SERVER_TIMESTAMP = {
+  '.sv': 'timestamp'
+};
+
 export function serverTimestamp(): object {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
+  return SERVER_TIMESTAMP;
 }
 
 export function increment(delta: number): object {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  return {} as any;
+  return {
+    '.sv': {
+      'increment': delta
+    }
+  };
 }