diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 4e67416d92..b5deeff21c 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -250,7 +250,7 @@ export class StopGapWidget extends EventEmitter {
 
         // Actually ask for permission to send the user's data
         Modal.createTrackedDialog("OpenID widget permissions", '', WidgetOpenIDPermissionsDialog, {
-            widgetUrl: rawUrl.substr(0, rawUrl.lastIndexOf("?")),
+            widgetUrl: rawUrl.includes("?") ? rawUrl.substr(0, rawUrl.indexOf("?")) : rawUrl,
             widgetId: this.widgetId,
             isUserWidget: this.appTileProps.userWidget,