diff --git a/assets/src/js/godam-gallery.js b/assets/src/js/godam-gallery.js
index 70b53e556..d0c36cb9f 100644
--- a/assets/src/js/godam-gallery.js
+++ b/assets/src/js/godam-gallery.js
@@ -246,7 +246,7 @@ document.addEventListener( 'click', async function( e ) {
 						status: 'success',
 					};
 				} else {
-					const response = await fetch( `/wp-json/godam/v1/video-shortcode?id=${ newVideoId }` );
+					const response = await fetch(`/wp-json/godam/v1/cf7-form?id=${newVideoId}`);
 					data = await response.json();
 
 					if ( data.status === 'success' && data.html ) {
diff --git a/inc/classes/wpforms/wpforms-field-godam-record-entry-edit.php b/inc/classes/wpforms/wpforms-field-godam-record-entry-edit.php
index 57915bdaf..1641510f3 100644
--- a/inc/classes/wpforms/wpforms-field-godam-record-entry-edit.php
+++ b/inc/classes/wpforms/wpforms-field-godam-record-entry-edit.php
@@ -41,6 +41,23 @@ class="godam-video-link <?php echo ( empty( $value ) ? 'hidden' : '' ); ?>"
 >
 	<div class="godam-video-name"><?php echo esc_html( $video_name ); ?></div>
 </a>
+<?php if ( ! empty( $value ) ) : ?>
+    <a
+        href="<?php echo esc_url( add_query_arg(
+            array(
+                'form_id'  => absint( $form_id ),
+                'entry_id' => absint( $entry_id ),
+                'field_id' => absint( $field['id'] ),
+            ),
+            site_url( '/godam-recorder/' )
+        ) ); ?>"
+        target="_blank"
+        class="button godam-recorder-link"
+    >
+        <?php esc_html_e( 'Open Recorder', 'godam' ); ?>
+    </a>
+<?php endif; ?>
+
 <div class="godam-video-media-controls">
 	<button
 		type="button"
diff --git a/inc/classes/wpforms/wpforms-field-godam-record-entry-view.php b/inc/classes/wpforms/wpforms-field-godam-record-entry-view.php
index 1aec69575..bd6780fd6 100644
--- a/inc/classes/wpforms/wpforms-field-godam-record-entry-view.php
+++ b/inc/classes/wpforms/wpforms-field-godam-record-entry-view.php
@@ -18,13 +18,23 @@
 $transcoded_url     = WPForms_Integration_Helper::get_transcoded_url( $form_id, $entry_id, $field_id );
 $hls_transcoded_url = WPForms_Integration_Helper::get_hls_transcoded_url( $form_id, $entry_id, $field_id );
 $transcoded_status  = WPForms_Integration_Helper::get_transcoded_status( $form_id, $entry_id, $field_id );
+
+
+$recorder_url = add_query_arg(
+	array(
+		'form_id'  => $form_id,
+		'entry_id' => $entry_id,
+		'field_id' => $field_id,
+	),
+	site_url( '/godam-recorder/' )
+);
 ?>
 
 <div class="godam-video-preview">
 	<div class="godam-video-link-wrapper">
 		<span><?php esc_html_e( 'URL: ', 'godam' ); ?></span>
 		<a
-			href="<?php echo esc_url( $attachment_url ); ?>"
+			href="<?php echo esc_url( $recorder_url ); ?>"
 			target="_blank"
 			class="godam-video-link <?php echo ( empty( $value ) ? 'hidden' : '' ); ?>"
 		>