diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c
index ad684cc8b7..73d1981292 100644
--- a/orte/mca/snapc/full/snapc_full_global.c
+++ b/orte/mca/snapc/full/snapc_full_global.c
@@ -512,11 +512,18 @@ int global_coord_end_ckpt(orte_snapc_base_quiesce_t *datum)
     if( currently_migrating ) {
         OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle,
                              "Global) End Ckpt: Flush the modex cached data\n"));
-        if (OPAL_SUCCESS != (ret = opal_db.remove(NULL, NULL))) {
+
+        /* TODO: You can't pass NULL as the identifier - what you'll need to do is
+         * close all open dstore handles, and then open the ones you need
+         */
+#if 0
+        if (OPAL_SUCCESS != (ret = opal_dstore.remove(NULL, NULL))) {
             ORTE_ERROR_LOG(ret);
             exit_status = ret;
             goto cleanup;
         }
+#endif
+
         orte_grpcomm.finalize();
         if (ORTE_SUCCESS != (ret = orte_grpcomm.init())) {
             ORTE_ERROR_LOG(ret);
diff --git a/orte/mca/snapc/full/snapc_full_local.c b/orte/mca/snapc/full/snapc_full_local.c
index 61e7bc77f1..93bdce99b9 100644
--- a/orte/mca/snapc/full/snapc_full_local.c
+++ b/orte/mca/snapc/full/snapc_full_local.c
@@ -1751,10 +1751,18 @@ static void snapc_full_local_comm_read_event(int fd, short flags, void *arg)
     if( currently_migrating && !flushed_modex ) {
         OPAL_OUTPUT_VERBOSE((10, mca_snapc_full_component.super.output_handle,
                              "Local) Read Event: Flush the modex cached data\n"));
-        if (OPAL_SUCCESS != (ret = opal_db.remove(NULL, NULL))) {
+
+        /* TODO: You can't pass NULL as the identifier - what you'll need to do is
+         * close all open dstore handles, and then open the ones you need
+         */
+#if 0
+        if (OPAL_SUCCESS != (ret = opal_dstore.remove(NULL, NULL))) {
             ORTE_ERROR_LOG(ret);
+            exit_status = ret;
             goto cleanup;
         }
+#endif
+
         orte_grpcomm.finalize();
         if (ORTE_SUCCESS != (ret = orte_grpcomm.init())) {
             ORTE_ERROR_LOG(ret);