diff --git a/src/dft/dft.cc b/src/dft/dft.cc
index d113f4e5e..832c9c933 100644
--- a/src/dft/dft.cc
+++ b/src/dft/dft.cc
@@ -2077,7 +2077,7 @@ namespace dftfe
     computing_timer.enter_subsection("Nuclear self-potential solve");
     computingTimerStandard.enter_subsection("Nuclear self-potential solve");
 #ifdef DFTFE_WITH_DEVICE
-    if (d_dftParamsPtr->useDevice)
+    if (d_dftParamsPtr->useDevice and false)
       d_vselfBinsManager.solveVselfInBinsDevice(
         d_basisOperationsPtrElectroHost,
         d_baseDofHandlerIndexElectro,
diff --git a/src/dft/solveNSCF.cc b/src/dft/solveNSCF.cc
index c626994bb..cb8223a43 100644
--- a/src/dft/solveNSCF.cc
+++ b/src/dft/solveNSCF.cc
@@ -74,7 +74,7 @@ namespace dftfe
     computing_timer.enter_subsection("Nuclear self-potential solve");
     computingTimerStandard.enter_subsection("Nuclear self-potential solve");
 #ifdef DFTFE_WITH_DEVICE
-    if (d_dftParamsPtr->useDevice)
+    if (d_dftParamsPtr->useDevice and false)
       d_vselfBinsManager.solveVselfInBinsDevice(
         d_basisOperationsPtrElectroHost,
         d_baseDofHandlerIndexElectro,