diff --git a/src/main/bash/gvm-main.sh b/src/main/bash/gvm-main.sh
index cafcc0cd..5c250dca 100644
--- a/src/main/bash/gvm-main.sh
+++ b/src/main/bash/gvm-main.sh
@@ -30,7 +30,7 @@ function gvm {
 		BROADCAST_LIVE=$(curl -s "${GVM_SERVICE}/broadcast/${GVM_VERSION}")
 	fi
 
-	if [[ -z "${BROADCAST_LIVE}" && "${GVM_ONLINE}" == "true" ]]; then
+	if [[ -z "${BROADCAST_LIVE}" && "${GVM_ONLINE}" == "true" && "$1" != "offline" ]]; then
 		echo "${OFFLINE_BROADCAST}"
 	fi
 
diff --git a/src/test/cucumber/gvm/forced_offline_mode.feature b/src/test/cucumber/gvm/forced_offline_mode.feature
index ab7f5730..abcb5553 100644
--- a/src/test/cucumber/gvm/forced_offline_mode.feature
+++ b/src/test/cucumber/gvm/forced_offline_mode.feature
@@ -15,7 +15,8 @@ Feature: Forced Offline Mode
   Scenario: Enable Offline Mode with internet reachable
     Given offline mode is disabled with reachable internet
     When I enter "gvm offline enable"
-    Then I see "OFFLINE MODE ENABLED!"
+    Then I see "Forced offline mode enabled."
+    And I do not see "OFFLINE MODE ENABLED!"
     When I enter "gvm install grails 2.1.0"
     Then I see "Stop! grails 2.1.0 is not available in offline mode."