diff --git a/java/src/main/java/org/rocksdb/RocksDB.java b/java/src/main/java/org/rocksdb/RocksDB.java
index 4d5423730..2af55c420 100644
--- a/java/src/main/java/org/rocksdb/RocksDB.java
+++ b/java/src/main/java/org/rocksdb/RocksDB.java
@@ -1270,7 +1270,10 @@ public class RocksDB extends RocksObject {
    * @return The handle of the default column family
    */
   public ColumnFamilyHandle getDefaultColumnFamily() {
-    return new ColumnFamilyHandle(this, getDefaultColumnFamily(nativeHandle_));
+    ColumnFamilyHandle cfHandle = new ColumnFamilyHandle(this,
+        getDefaultColumnFamily(nativeHandle_));
+    cfHandle.disOwnNativeHandle();
+    return cfHandle;
   }
 
   /**
diff --git a/java/src/test/java/org/rocksdb/ColumnFamilyTest.java b/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
index f6d5b9f9d..72e93d268 100644
--- a/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
+++ b/java/src/test/java/org/rocksdb/ColumnFamilyTest.java
@@ -58,11 +58,7 @@ public class ColumnFamilyTest {
     Options options = null;
     ColumnFamilyHandle cfh = null;
     try {
-      options = new Options();
-      options.setCreateIfMissing(true);
-
-      DBOptions dbOptions = new DBOptions();
-      dbOptions.setCreateIfMissing(true);
+      options = new Options().setCreateIfMissing(true);
 
       db = RocksDB.open(options, dbFolder.getRoot().getAbsolutePath());
       cfh = db.getDefaultColumnFamily();
@@ -78,9 +74,6 @@ public class ColumnFamilyTest {
       assertThat(cfh).isNotNull();
       assertThat(actualValue).isEqualTo(value);
     } finally {
-      if (cfh != null) {
-        cfh.dispose();
-      }
       if (db != null) {
         db.close();
       }