diff --git a/OCLStream.cpp b/OCLStream.cpp
index 7bc5a78..4d6e85a 100644
--- a/OCLStream.cpp
+++ b/OCLStream.cpp
@@ -186,6 +186,8 @@ OCLStream<T>::~OCLStream()
   delete mul_kernel;
   delete add_kernel;
   delete triad_kernel;
+
+  devices.clear();
 }
 
 template <class T>
diff --git a/SYCLStream.cpp b/SYCLStream.cpp
index ea9c55f..171c9f7 100644
--- a/SYCLStream.cpp
+++ b/SYCLStream.cpp
@@ -94,6 +94,7 @@ SYCLStream<T>::~SYCLStream()
 
   delete p;
   delete queue;
+  devices.clear();
 }
 
 template <class T>
@@ -322,7 +323,6 @@ std::string getDeviceDriver(const int device)
   return driver;
 }
 
-
 // TODO: Fix kernel names to allow multiple template specializations
 template class SYCLStream<float>;
 template class SYCLStream<double>;