diff --git a/src/emulator.cpp b/src/emulator.cpp
index f5719eaf5..9a0429d5d 100644
--- a/src/emulator.cpp
+++ b/src/emulator.cpp
@@ -193,6 +193,9 @@ void Emulator::Run(const std::filesystem::path& file, const std::vector<std::str
     std::string remote_url(Common::g_scm_remote_url);
     std::string remote_host;
     try {
+        if (*remote_url.rbegin() == '/') {
+            remote_url.pop_back();
+        }
         remote_host = remote_url.substr(19, remote_url.rfind('/') - 19);
     } catch (...) {
         remote_host = "unknown";
diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp
index d23811fc0..1966aa52b 100644
--- a/src/qt_gui/main_window.cpp
+++ b/src/qt_gui/main_window.cpp
@@ -58,6 +58,9 @@ bool MainWindow::Init() {
     std::string remote_url(Common::g_scm_remote_url);
     std::string remote_host;
     try {
+        if (*remote_url.rbegin() == '/') {
+            remote_url.pop_back();
+        }
         remote_host = remote_url.substr(19, remote_url.rfind('/') - 19);
     } catch (...) {
         remote_host = "unknown";