diff --git a/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c
index 8fb284f965..db8cb48d18 100644
--- a/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32F0/analogout_device.c
@@ -84,8 +84,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC1_RELEASE_RESET();
     __HAL_RCC_DAC1_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c
index d58f2e422d..d50e8e464c 100644
--- a/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32F1/analogout_device.c
@@ -96,8 +96,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c
index d58f2e422d..d50e8e464c 100644
--- a/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32F2/analogout_device.c
@@ -96,8 +96,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c b/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c
index 67c2b94188..2e13095567 100644
--- a/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32F3/analogout_device.c
@@ -158,8 +158,8 @@ void analogout_free(dac_t *obj)
     }
 #endif
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c
index bb71818cb2..1925e107b5 100644
--- a/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G0/analogout_device.c
@@ -118,8 +118,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c b/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
index f560829022..6e260940ea 100644
--- a/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32G4/analogout_device.c
@@ -146,8 +146,8 @@ void analogout_free(dac_t *obj)
     }
 #endif
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
index a31b2b11ad..ef63640406 100644
--- a/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32L0/analogout_device.c
@@ -120,8 +120,8 @@ void analogout_free(dac_t *obj)
         __DAC_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c
index de737c46ae..e4bd9b0761 100644
--- a/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32L1/analogout_device.c
@@ -99,8 +99,8 @@ void analogout_free(dac_t *obj)
         __DAC_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c
index 7953aa8063..c1e8be56fd 100644
--- a/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32L4/analogout_device.c
@@ -131,8 +131,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 
     sleep_manager_unlock_deep_sleep();
 }
diff --git a/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c b/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c
index f6d42fe06f..fcf8fd7033 100644
--- a/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32L5/analogout_device.c
@@ -125,8 +125,8 @@ void analogout_free(dac_t *obj)
         __HAL_RCC_DAC1_CLK_DISABLE();
     }
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()
diff --git a/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c b/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c
index 4ef747858b..8368cde698 100644
--- a/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c
+++ b/targets/TARGET_STM/TARGET_STM32WL/analogout_device.c
@@ -99,8 +99,8 @@ void analogout_free(dac_t *obj)
     __HAL_RCC_DAC_RELEASE_RESET();
     __HAL_RCC_DAC_CLK_DISABLE();
 
-    // Configure GPIO
-    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
+    // Configure GPIO back to reset value
+    pin_function(obj->pin, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0));
 }
 
 const PinMap *analogout_pinmap()