diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php
index fe837da86e..2487cbe73e 100644
--- a/app/call_block/call_block_edit.php
+++ b/app/call_block/call_block_edit.php
@@ -77,7 +77,7 @@
 		$call_block_data = $action_array[1] ?? null;
 
 		//sanitize the data
-		$extension_uuid = preg_replace("#[^a-fA-F0-9./]#", "", $extension_uuid);
+		$extension_uuid = (!empty($extension_uuid) && is_uuid($extension_uuid)) ? $extension_uuid : null;
 		$call_block_country_code = preg_replace('#[^0-9./]#', '', $call_block_country_code ?? '');
 		$call_block_number = preg_replace('#[^0-9./]#', '', $call_block_number ?? '');
 	}
@@ -183,9 +183,7 @@
 						$array['call_block'][0]['call_block_uuid'] = uuid();
 						$array['call_block'][0]['domain_uuid'] = $domain_uuid;
 						$array['call_block'][0]['call_block_direction'] = $call_block_direction;
-						if (!empty($extension_uuid) && is_uuid($extension_uuid)) {
-							$array['call_block'][0]['extension_uuid'] = $extension_uuid;
-						}
+						$array['call_block'][0]['extension_uuid'] = $extension_uuid;
 						$array['call_block'][0]['call_block_name'] = $call_block_name;
 						$array['call_block'][0]['call_block_country_code'] = $call_block_country_code;
 						$array['call_block'][0]['call_block_number'] = $call_block_number;
@@ -233,9 +231,7 @@
 						$array['call_block'][0]['call_block_uuid'] = $call_block_uuid;
 						$array['call_block'][0]['domain_uuid'] = $domain_uuid;
 						$array['call_block'][0]['call_block_direction'] = $call_block_direction;
-						if (!empty($extension_uuid) && is_uuid($extension_uuid)) {
-							$array['call_block'][0]['extension_uuid'] = $extension_uuid;
-						}
+						$array['call_block'][0]['extension_uuid'] = $extension_uuid;
 						$array['call_block'][0]['call_block_name'] = $call_block_name;
 						$array['call_block'][0]['call_block_country_code'] = $call_block_country_code;
 						$array['call_block'][0]['call_block_number'] = $call_block_number;