diff --git a/src/device/device_default.cpp b/src/device/device_default.cpp
index a38d96c15..c3ba42000 100644
--- a/src/device/device_default.cpp
+++ b/src/device/device_default.cpp
@@ -254,10 +254,10 @@ namespace hw {
                 default_core_device->set_name("default_core_device");
 
             }
-            registry.insert(std::make_pair("default",default_core_device));
+            registry.insert(std::make_pair("default", std::unique_ptr<device>(default_core_device)));
         }
 
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/device/device_ledger.cpp b/src/device/device_ledger.cpp
index e8eb7cc8b..cede834a1 100644
--- a/src/device/device_ledger.cpp
+++ b/src/device/device_ledger.cpp
@@ -2054,7 +2054,7 @@ namespace hw {
         legder_device = new device_ledger();
         legder_device->set_name("Ledger");
       }
-      registry.insert(std::make_pair("Ledger", legder_device));
+      registry.insert(std::make_pair("Ledger", std::unique_ptr<device>(legder_device)));
     }
   
   #else //WITH_DEVICE_LEDGER